diff --git a/services/sync/tps/extensions/tps/resource/modules/tabs.jsm b/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
index 59070552c346..8a9cfce0b22f 100644
--- a/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
@@ -70,16 +70,15 @@ var BrowserTabs = {
    */
   Find(uri, title, profile) {
     // Find the uri in Weave's list of tabs for the given profile.
-    let tabEngine = Weave.Service.engineManager.get("tabs");
-    for (let client of Weave.Service.clientsEngine.remoteClients) {
-      let tabClient = tabEngine.getClientById(client.id)
-      if (!tabClient || !tabClient.tabs) {
+    let engine = Weave.Service.engineManager.get("tabs");
+    for (let [, client] of Object.entries(engine.getAllClients())) {
+      if (!client.tabs) {
         continue;
       }
-      for (let key in tabClient.tabs) {
-        let tab = tabClient.tabs[key];
+      for (let key in client.tabs) {
+        let tab = client.tabs[key];
         let weaveTabUrl = tab.urlHistory[0];
-        if (uri == weaveTabUrl && profile == client.name)
+        if (uri == weaveTabUrl && profile == client.clientName)
           if (title == undefined || title == tab.title)
             return true;
         }