diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index c2df20209..be5b8243d 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -171,10 +171,12 @@ function mark_connected(session)
 	local sendq, send = session.sendq, session.send;
 	if sendq then
 		session.log("debug", "sending queued stanzas across new connection");
-		for _, data in ipairs(sendq) do
+		for i, data in ipairs(sendq) do
 			session.log("debug", "sending: %s", tostring(data));
 			send(data);
+			sendq[i] = nil;
 		end
+		session.sendq = nil;
 	end
 end