diff --git a/js/background.js b/js/background.js
index ee9f360376..0e46d6c071 100644
--- a/js/background.js
+++ b/js/background.js
@@ -101,6 +101,8 @@
     };
 
     Whisper.events.on('start-shutdown', function() {
+      Whisper.RotateSignedPreKeyListener.stop();
+
       if (messageReceiver) {
         messageReceiver.close().then(function() {
           messageReceiver = null;
diff --git a/js/rotate_signed_prekey_listener.js b/js/rotate_signed_prekey_listener.js
index 897c41fdcd..8e8b29f8d8 100644
--- a/js/rotate_signed_prekey_listener.js
+++ b/js/rotate_signed_prekey_listener.js
@@ -59,6 +59,15 @@
                     setTimeoutForNextRun();
                 }
             });
+        },
+        stop: function() {
+            console.log('Stopping signed prekey rotation');
+            clearTimeout(timeout);
+            timeout = null;
+        },
+        start: function() {
+            console.log('Starting signed prekey rotation');
+            setTimeoutForNextRun();
         }
     };
 }());