diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3d5f462..e8c72b00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ TODO: only compatible with Prosody 0.12.x. So it should be documented for people
 TODO: it seems that in some case A->B can be Websocket, and B->A direct S2S. Check if this is fine. And maybe we can optimise some code, by allowing directS2S event if current server dont accept it.
 TODO?: always generate self-signed certificates. Could be used for outgoing s2s?
 TODO: check in the diagnostic tool that Prosody is >=0.12
+TODO?: allow directs2s on one side and websocket on the other? (currently disallowed by compatibleRemoteAuthenticatedConnectionEnabled)
 
 ### Minor changes and fixes
 
diff --git a/prosody-modules/mod_websocket_s2s_peertubelivechat/mod_websocket_s2s_peertubelivechat.lua b/prosody-modules/mod_websocket_s2s_peertubelivechat/mod_websocket_s2s_peertubelivechat.lua
index 59cc3888..e6f47b82 100644
--- a/prosody-modules/mod_websocket_s2s_peertubelivechat/mod_websocket_s2s_peertubelivechat.lua
+++ b/prosody-modules/mod_websocket_s2s_peertubelivechat/mod_websocket_s2s_peertubelivechat.lua
@@ -601,7 +601,8 @@ function route_to_new_session(event)
 		-- so we will send keepalives on outgoing connections (in addition to keepalives sent by mod_s2s).
 		session.ws_s2s_keepalive_timer = module:add_timer(websocket_s2s_ping_interval, function ()
 			log("debug", "Timer triggered, sending a keepalive on outgoing websocket s2s");
-			return session.conn:write(build_frame({ opcode = 0x9, FIN = true }));
+			session.conn:write(build_frame({ opcode = 0x9, FIN = true }));
+			return websocket_s2s_ping_interval;
 		end);
 	end