diff --git a/lib/msf/core/handler/reverse_http.rb b/lib/msf/core/handler/reverse_http.rb
index 7c9a38030d..ead8bbf95f 100644
--- a/lib/msf/core/handler/reverse_http.rb
+++ b/lib/msf/core/handler/reverse_http.rb
@@ -91,6 +91,7 @@ module ReverseHttp
 	# Simply calls stop handler to ensure that things are cool.
 	#
 	def cleanup_handler
+		stop_handler
 	end
 
 	#
diff --git a/lib/msf/core/handler/reverse_https.rb b/lib/msf/core/handler/reverse_https.rb
index 3624eb64b8..1b747d729a 100644
--- a/lib/msf/core/handler/reverse_https.rb
+++ b/lib/msf/core/handler/reverse_https.rb
@@ -92,6 +92,7 @@ module ReverseHttps
 	# Simply calls stop handler to ensure that things are cool.
 	#
 	def cleanup_handler
+		stop_handler
 	end
 
 	#