diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c72b00..77dd0bf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ TODO: it seems that in some case A->B can be Websocket, and B->A direct S2S. Che
 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)
+TODO: alpha.4 version force Websocket S2S when available, even if s2s is possible. Revert this before releasing.
 
 ### Minor changes and fixes
 
diff --git a/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua b/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
index a7b47cea..ea416cc4 100644
--- a/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
+++ b/prosody-modules/mod_s2s_peertubelivechat/mod_s2s_peertubelivechat.lua
@@ -10,12 +10,13 @@ function discover_websocket_s2s(event)
 	local to_host = event.to_host;
   module:log("debug", "Searching websocket s2s for remote host %s", to_host);
 
-	local f_s2s = io.open(path.join(server_infos_dir, to_host, 's2s'), "r");
-	if f_s2s ~= nil then
-		io.close(f_s2s);
-		module:log("debug", "Remote host is a known Peertube %s that has s2s activated, we will let legacy s2s module handle the connection", to_host);
-		return;
-	end
+	-- FIXME: this was commented for the 6.4.0-alpha4, to test ws s2s. Revert before releasing.
+	-- local f_s2s = io.open(path.join(server_infos_dir, to_host, 's2s'), "r");
+	-- if f_s2s ~= nil then
+	-- 	io.close(f_s2s);
+	-- 	module:log("debug", "Remote host is a known Peertube %s that has s2s activated, we will let legacy s2s module handle the connection", to_host);
+	-- 	return;
+	-- end
 
 	local f_ws_proxy = io.open(path.join(server_infos_dir, to_host, 'ws-s2s'), "r");
 	if f_ws_proxy == nil then