diff --git a/lib/msf/core/rpc/service.rb b/lib/msf/core/rpc/service.rb
index 6f79830983..91057f00a6 100644
--- a/lib/msf/core/rpc/service.rb
+++ b/lib/msf/core/rpc/service.rb
@@ -38,6 +38,7 @@ class Service < ::XMLRPC::BasicServer
 	def stop
 		self.state = {}
 		self.service.stop
+		self.service.close
 	end
 
 	def wait