diff --git a/js/models/conversations.js b/js/models/conversations.js
index 519dcbf7bd..422bcb1248 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -199,6 +199,7 @@
     },
 
     updateExpirationTimer: function(expireTimer, source, received_at) {
+        if (!expireTimer) { expireTimer = null; }
         source = source || textsecure.storage.user.getNumber();
         var timestamp = received_at || Date.now();
         this.save({ expireTimer: expireTimer });
diff --git a/js/models/messages.js b/js/models/messages.js
index eee399c045..184d3904ed 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -424,7 +424,7 @@
                                       message.get('received_at'));
                                 }
                             } else if (conversation.get('expireTimer')) {
-                                conversation.updateExpirationTimer(0, source,
+                                conversation.updateExpirationTimer(null, source,
                                     message.get('received_at'));
                             }
                         }
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 0f7be3819d..194feaa230 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -32,8 +32,10 @@
         },
         setTimer: function(e) {
             var seconds = this.$(e.target).data().seconds;
-            if (seconds >= 0) {
+            if (seconds > 0) {
                 this.model.updateExpirationTimer(seconds);
+            } else {
+                this.model.updateExpirationTimer(null);
             }
         },
         render: function() {