diff --git a/src/devices/BaseDevice.js b/src/devices/BaseDevice.js
index 9fb1d954a..143373b4a 100644
--- a/src/devices/BaseDevice.js
+++ b/src/devices/BaseDevice.js
@@ -66,7 +66,7 @@ export default class BaseDevice {
   }
 
   toJSON() {
-    return `<${this.constructor.name}#${this.title}>`;
+    return `<${this.constructor.name}#${this.title}#${this.serial}>`;
   }
 
   teardown() {}
diff --git a/src/server.js b/src/server.js
index 2608330a0..bbf9c09f9 100644
--- a/src/server.js
+++ b/src/server.js
@@ -253,7 +253,7 @@ export default class Server extends EventEmitter {
   addConnection(conn: ReactiveSocket, query: ClientQuery): Client {
     invariant(query, 'expected query');
 
-    const id = `${query.app}-${query.os}-${query.device}-${query.device_id}`;
+    const id = `${query.app}#${query.os}#${query.device}#${query.device_id}`;
     console.debug(`Device connected: ${id}`, 'server');
 
     const client = new Client(id, query, conn, this.logger, this.store);