--- a/core/stanza_router.lua	Fri Aug 26 19:03:23 2022 +0200
+++ b/core/stanza_router.lua	Fri Aug 26 19:10:15 2022 +0200
@@ -127,7 +127,7 @@
 		end
 		core_post_stanza(origin, stanza, origin.full_jid);
 	else
-		local h = hosts[stanza.attr.to or origin.host or origin.to_host];
+		local h = hosts[stanza.attr.to or origin.host];
 		if h then
 			local event;
 			if xmlns == nil then
@@ -143,7 +143,7 @@
 			if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end
 		end
 		if host and not hosts[host] then host = nil; end -- COMPAT: workaround for a Pidgin bug which sets 'to' to the SRV result
-		handle_unhandled_stanza(host or origin.host or origin.to_host, origin, stanza);
+		handle_unhandled_stanza(host or origin.host, origin, stanza);
 	end
 end
 

--- a/plugins/mod_s2s.lua	Fri Aug 26 19:03:23 2022 +0200
+++ b/plugins/mod_s2s.lua	Fri Aug 26 19:10:15 2022 +0200
@@ -275,7 +275,7 @@
 	function module.unload()
 		if module.reloading then return end
 		for _, session in pairs(sessions) do
-			if session.to_host == module.host or session.from_host == module.host then
+			if session.host == module.host then
 				session:close("host-gone");
 			end
 		end