--- a/devtools/shared/adb/adb-running-checker.js
+++ b/devtools/shared/adb/adb-running-checker.js
@@ -10,52 +10,67 @@
 
 "use strict";
 
 const client = require("./adb-client");
 
 exports.check = async function check() {
   let socket;
   let state;
+  let timerID;
+  const TIMEOUT_TIME = 1000;
 
   console.debug("Asking for host:version");
 
   return new Promise(resolve => {
+    // On MacOSX connecting to a port which is not started listening gets
+    // stuck (bug 1481963), to avoid the stuck, we do forcibly fail the
+    // connection after |TIMEOUT_TIME| elapsed.
+    timerID = setTimeout(() => {
+      socket.close();
+      resolve(false);
+    }, TIMEOUT_TIME);
+
+    function finish(returnValue) {
+      clearTimeout(timerID);
+      resolve(returnValue);
+    }
+
     const runFSM = function runFSM(packetData) {
       console.debug("runFSM " + state);
       switch (state) {
         case "start":
           const req = client.createRequest("host:version");
           socket.send(req);
           state = "wait-version";
           break;
         case "wait-version":
           // TODO: Actually check the version number to make sure the daemon
           //       supports the commands we want to use
           const { length, data } = client.unpackPacket(packetData);
           console.debug("length: ", length, "data: ", data);
           socket.close();
           const version = parseInt(data, 16);
           if (version >= 31) {
-            resolve(true);
+            finish(true);
           } else {
             console.log("killing existing adb as we need version >= 31");
-            resolve(false);
+            finish(false);
           }
           break;
         default:
           console.debug("Unexpected State: " + state);
-          resolve(false);
+          finish(false);
       }
     };
 
     const setupSocket = function() {
       socket.s.onerror = function(event) {
         console.debug("running checker onerror");
-        resolve(false);
+        finish(false);
       };
 
       socket.s.onopen = function(event) {
         console.debug("running checker onopen");
         state = "start";
         runFSM();
       };