diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 6877ee18d..c05f72292 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -134,6 +134,7 @@ function mark_connected(session)
 			session.sendq = nil;
 		end
 		
+		session.ip_hosts = nil;
 		session.srv_hosts = nil;
 	end
 end
diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index 2573251fb..9f5225954 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -255,7 +255,7 @@ function stream_callbacks.streamdisconnected(session, err)
 		end
 	end
 	(session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
-	sessions[session.conn]  = nil;
+	sessions[session.conn] = nil;
 	s2s_destroy_session(session, err);
 end