--- a/mod_firewall/conditions.lib.lua	Fri Feb 24 09:49:30 2017 +0000
+++ b/mod_firewall/conditions.lib.lua	Fri Feb 24 09:50:49 2017 +0000
@@ -76,7 +76,8 @@
 end
 
 function condition_handlers.TO_SELF()
-	return ("to == nil");
+	-- Intentionally not using 'to' here, as that defaults to bare JID when nil
+	return ("stanza.attr.to == nil");
 end
 
 function condition_handlers.TYPE(type)