diff --git a/lib/msf/core/db.rb b/lib/msf/core/db.rb
index 4402fe2b94..e31a10a701 100644
--- a/lib/msf/core/db.rb
+++ b/lib/msf/core/db.rb
@@ -370,6 +370,11 @@ class DBManager
 			host = report_host(hopts)
 		end
 
+		if opts[:port].to_i.zero?
+			dlog("Skipping port zero for service '%s' on host '%s'" % [opts[:name],host.address])
+			return nil
+		end
+
 		ret  = {}
 =begin
 		host = get_host(:workspace => wspace, :address => addr)