diff --git a/js/chromium.js b/js/chromium.js
index a2e080770..87412124f 100644
--- a/js/chromium.js
+++ b/js/chromium.js
@@ -169,6 +169,9 @@
             return chrome.i18n.getMessage(message, substitutions);
         }
     };
+    if (window.chrome && chrome.i18n) {
+        moment.locale(chrome.i18n.getUILanguage());
+    }
 
     window.textsecure = window.textsecure || {};
     window.textsecure.registration = {
diff --git a/js/views/timestamp_view.js b/js/views/timestamp_view.js
index e356b633a..2fed1d9db 100644
--- a/js/views/timestamp_view.js
+++ b/js/views/timestamp_view.js
@@ -5,8 +5,6 @@
     'use strict';
     window.Whisper = window.Whisper || {};
 
-    moment.locale(chrome.i18n.getUILanguage());
-
     Whisper.TimestampView = Whisper.View.extend({
         initialize: function(options) {
             extension.windows.onClosed(this.clearTimeout.bind(this));