diff --git a/src/ws/connection.js b/src/ws/connection.js
index 19ced7f0d14ba7b86c43b11eec7da2b236cd1bab..7a759346f4306f93363be40dfad96016df6e157e 100644
--- a/src/ws/connection.js
+++ b/src/ws/connection.js
@@ -49,12 +49,12 @@ function Worker() {
 const buildKeepalivePayload = async () => {
   const { user } = AuthStore.getRawState();
   const payload = user && user.id ? user.id.toString() : "";
-  const signature = user.secret ? hmacSHA1(payload, user.secret) : null;
+  const signature = !!user.secret ? hmacSHA1(payload, user.secret) : null;
 
   return {
     event: "KEEPALIVE",
     payload,
-    sig: hex.stringify(signature),
+    sig: signature ? hex.stringify(signature) : null,
   };
 };