diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 85b88caaf..b710602b3 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38501,6 +38501,7 @@ axolotlInternal.RecipientRecord = function() {
                 if (this.disconnect) {
                     // automatically disconnect if server doesn't ack
                     this.disconnectTimer = setTimeout(function() {
+                        clearTimeout(this.keepAliveTimer);
                         this.wsr.close(3001, 'No response to keepalive request');
                     }.bind(this), 1000);
                 } else {
diff --git a/libtextsecure/websocket-resources.js b/libtextsecure/websocket-resources.js
index b25354dd9..8e624a823 100644
--- a/libtextsecure/websocket-resources.js
+++ b/libtextsecure/websocket-resources.js
@@ -185,6 +185,7 @@
                 if (this.disconnect) {
                     // automatically disconnect if server doesn't ack
                     this.disconnectTimer = setTimeout(function() {
+                        clearTimeout(this.keepAliveTimer);
                         this.wsr.close(3001, 'No response to keepalive request');
                     }.bind(this), 1000);
                 } else {