diff --git a/lib/msf/core/exploit/browser_autopwnv2.rb b/lib/msf/core/exploit/browser_autopwnv2.rb
index 6c9af0992b..bde7c76d6c 100644
--- a/lib/msf/core/exploit/browser_autopwnv2.rb
+++ b/lib/msf/core/exploit/browser_autopwnv2.rb
@@ -654,7 +654,7 @@ module Msf
 
       exploit_list.each do |mod|
         proto = datastore['SSL'] ? 'https' : 'http'
-        host = datastore['URIHOST'] || Rex::Socket.source_address
+        host = (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address : datastore['SRVHOST']
         port = datastore['SRVPORT']
         resource = mod.datastore['URIPATH']
         url = "#{proto}://#{host}:#{port}#{resource}"