diff --git a/src/chrome/MainSidebar.js b/src/chrome/MainSidebar.js
index 599090ba3..33dac7b5a 100644
--- a/src/chrome/MainSidebar.js
+++ b/src/chrome/MainSidebar.js
@@ -28,6 +28,8 @@ import {devicePlugins} from '../device-plugins/index.js';
 import plugins from '../plugins/index.js';
 import {selectPlugin} from '../reducers/connections.js';
 import {connect} from 'react-redux';
+import AndroidDevice from '../devices/AndroidDevice.js';
+import IOSDevice from '../devices/IOSDevice.js';
 
 const CustomClickableListItem = ClickableListItem.extends({
   paddingLeft: 10,
@@ -164,10 +166,18 @@ class MainSidebar extends Component<MainSidebarProps> {
     });
 
     clients = clients
-      // currently we can't filter clients for a device, because all clients
-      // are reporting `unknown` as their deviceID, due to a change in Android's
-      // API.
-      //.filter((client: Client) => client.getDevice() === device)
+      .filter((client: Client) => {
+        if (
+          (device instanceof AndroidDevice &&
+            client.query.os.toLowerCase() !== 'android') ||
+          (device instanceof IOSDevice &&
+            client.query.os.toLowerCase() !== 'ios')
+        ) {
+          return false;
+        } else {
+          return true;
+        }
+      })
       .sort((a, b) => (a.query.app || '').localeCompare(b.query.app));
 
     return (