diff --git a/lib/msf/core/db.rb b/lib/msf/core/db.rb
index f2f14a82fa..2556d761b5 100644
--- a/lib/msf/core/db.rb
+++ b/lib/msf/core/db.rb
@@ -583,6 +583,7 @@ class DBManager
 				case opts[:proto].to_s.downcase # Catch incorrect usages
 				when 'tcp','udp'
 					proto = opts[:proto]
+					sname = opts[:sname] if opts[:sname]
 				when 'dns','snmp','dhcp'
 					proto = 'udp'
 					sname = opts[:proto]