diff --git a/js/models/conversations.js b/js/models/conversations.js
index 6ee6d668f..9485601f4 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -29,11 +29,7 @@
     database: Whisper.Database,
     storeName: 'conversations',
     defaults: function() {
-      var timestamp = new Date().getTime();
-      return {
-        unreadCount : 0,
-        timestamp   : timestamp,
-      };
+      return { unreadCount : 0 };
     },
 
     initialize: function() {
diff --git a/js/views/timestamp_view.js b/js/views/timestamp_view.js
index fedff7d4d..953347b47 100644
--- a/js/views/timestamp_view.js
+++ b/js/views/timestamp_view.js
@@ -13,6 +13,9 @@
             this.clearTimeout();
             var millis_now = Date.now();
             var millis = this.$el.data('timestamp');
+            if (millis === "") {
+                return;
+            }
             if (millis >= millis_now) {
                 millis = millis_now;
             }