diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index c127d9bdae..4a1c648c27 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38409,7 +38409,10 @@ axolotlInternal.RecipientRecord = function() {
 TextSecureWebSocket = function (url, opts) {
     'use strict';
     opts = opts || {};
-    var reconnectTimeout = opts.reconnectTimeout || 1000;
+    var reconnectTimeout = 1000;
+    if (opts && opts.reconnectTimeout !== undefined) {
+        reconnectTimeout = opts.reconnectTimeout;
+    }
     var reconnectSemaphore = 0;
     var socket;
     var calledClose = false;
diff --git a/libtextsecure/websocket.js b/libtextsecure/websocket.js
index 49917c495f..8dbb544249 100644
--- a/libtextsecure/websocket.js
+++ b/libtextsecure/websocket.js
@@ -25,7 +25,10 @@
 TextSecureWebSocket = function (url, opts) {
     'use strict';
     opts = opts || {};
-    var reconnectTimeout = opts.reconnectTimeout || 1000;
+    var reconnectTimeout = 1000;
+    if (opts && opts.reconnectTimeout !== undefined) {
+        reconnectTimeout = opts.reconnectTimeout;
+    }
     var reconnectSemaphore = 0;
     var socket;
     var calledClose = false;