diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 31f1c04d..8577d7cf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -101,6 +101,9 @@ public class ReceiveHelper {
         signalWebSocket.connect();
         signalWebSocket.registerKeepAliveToken("receive");
 
+        final var unauthenticatedSignalWebSocket = dependencies.getUnauthenticatedSignalWebSocket();
+        unauthenticatedSignalWebSocket.registerKeepAliveToken("receive");
+
         try {
             receiveMessagesInternal(signalWebSocket, timeout, maxMessages, handler, queuedActions);
         } finally {
@@ -109,6 +112,7 @@ public class ReceiveHelper {
             queuedActions.clear();
             signalWebSocket.removeKeepAliveToken("receive");
             signalWebSocket.disconnect();
+            unauthenticatedSignalWebSocket.removeKeepAliveToken("receive");
             webSocketStateDisposable.dispose();
             shouldStop = false;
         }