--- a/testing/marionette/server.js
+++ b/testing/marionette/server.js
@@ -380,21 +380,20 @@ server.TCPListener = class {
     }
 
     for (let k of this.alteredPrefs) {
       logger.debug(`Resetting recommended pref ${k}`);
       Preferences.reset(k);
     }
     this.alteredPrefs.clear();
 
-    Services.obs.notifyObservers(this, NOTIFY_RUNNING);
-
     // Shutdown server socket, and no longer listen for new connections
     this.acceptConnections = false;
 
+    Services.obs.notifyObservers(this, NOTIFY_RUNNING);
     this.alive = false;
   }
 
   onSocketAccepted(serverSocket, clientSocket) {
     let input = clientSocket.openInputStream(0, 0, 0);
     let output = clientSocket.openOutputStream(0, 0, 0);
     let transport = new DebuggerTransport(input, output);