diff --git a/desktop/app/src/utils/clientUtils.tsx b/desktop/app/src/utils/clientUtils.tsx
index 47a38113c..8ad37d379 100644
--- a/desktop/app/src/utils/clientUtils.tsx
+++ b/desktop/app/src/utils/clientUtils.tsx
@@ -63,7 +63,8 @@ export function buildClientId(clientInfo: {
   device: string;
   device_id: string;
 }): string {
-  for (const key of ['app', 'os', 'device', 'device_id'] as Array<
+  // N.B.: device_id can be empty, which designates the host device
+  for (const key of ['app', 'os', 'device'] as Array<
     keyof ClientIdConstituents
   >) {
     if (!clientInfo[key]) {