diff --git a/js/rotate_signed_prekey_listener.js b/js/rotate_signed_prekey_listener.js
index d9ee9cc7f..43fe6ff82 100644
--- a/js/rotate_signed_prekey_listener.js
+++ b/js/rotate_signed_prekey_listener.js
@@ -39,17 +39,17 @@
         var time = storage.get('nextSignedKeyRotationTime', now);
 
         if (scheduledTime !== time || !timeout) {
-            scheduledTime = time;
-
             console.log('Next signed key rotation scheduled for', new Date(time));
-            var waitTime = time - now;
-            if (waitTime < 0) {
-                waitTime = 0;
-            }
+        }
 
-            clearTimeout(timeout);
-            timeout = setTimeout(runWhenOnline, waitTime);
+        scheduledTime = time;
+        var waitTime = time - now;
+        if (waitTime < 0) {
+            waitTime = 0;
         }
+
+        clearTimeout(timeout);
+        timeout = setTimeout(runWhenOnline, waitTime);
     }
 
     Whisper.RotateSignedPreKeyListener = {
diff --git a/js/wall_clock_listener.js b/js/wall_clock_listener.js
index 558a8b346..e9d6b7ddd 100644
--- a/js/wall_clock_listener.js
+++ b/js/wall_clock_listener.js
@@ -7,7 +7,7 @@
     window.Whisper = window.Whisper || {};
 
     var lastTime;
-    var interval = 5000;
+    var interval = 1000;
     var events;
     function checkTime() {
       var currentTime = Date.now();