diff --git a/lib/msf/core/exploit/remote/socket_server.rb b/lib/msf/core/exploit/remote/socket_server.rb
index 1c5979b6e3..d3d5e10ffb 100644
--- a/lib/msf/core/exploit/remote/socket_server.rb
+++ b/lib/msf/core/exploit/remote/socket_server.rb
@@ -44,7 +44,7 @@ module Exploit::Remote::SocketServer
     primer
 
     # Wait on the service to stop
-    self.service.wait
+    self.service.wait if service
   end
 
   #