--- a/core/s2smanager.lua	Sun Jul 10 16:10:29 2022 +0200
+++ b/core/s2smanager.lua	Mon Jul 11 17:32:13 2022 +0200
@@ -94,7 +94,7 @@
 		hosts[session.from_host].s2sout[session.to_host] = nil;
 		session:bounce_sendq(bounce_reason or reason);
 	elseif session.direction == "incoming" then
-		if session.outgoing then
+		if session.outgoing and hosts[session.to_host].s2sout[session.from_host] == session then
 			hosts[session.to_host].s2sout[session.from_host] = nil;
 		end
 		incoming_s2s[session] = nil;