diff --git a/src/server.tsx b/src/server.tsx
index d56b9b503..7576087e1 100644
--- a/src/server.tsx
+++ b/src/server.tsx
@@ -314,6 +314,14 @@ class Server extends EventEmitter {
       : Promise.resolve(query.device_id)
     ).then(csrId => {
       query.device_id = csrId;
+      // in previous version (before 3), app may not appear in correct device
+      // section because it refers to the name given by client which is not fixed
+      // for android emulators, so it is indicated as outdated so that developers
+      // might want to update SDK to get rid of this connection swap problem
+      if (query.sdk_version && query.sdk_version < 3) {
+        query.app += ' (Outdated SDK)';
+      }
+
       const id = `${query.app}#${query.os}#${query.device}#${csrId}`;
       console.debug(`Device connected: ${id}`, 'server');