diff --git a/js/models/messages.js b/js/models/messages.js
index 67431eea68..5851cef6b2 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1,10 +1,12 @@
 /* global _: false */
 /* global Backbone: false */
-/* global Whisper: false */
-/* global textsecure: false */
+
 /* global ConversationController: false */
-/* global i18n: false */
 /* global getAccountManager: false */
+/* global i18n: false */
+/* global Signal: false */
+/* global textsecure: false */
+/* global Whisper: false */
 
 /* eslint-disable more/no-then */
 
@@ -14,8 +16,8 @@
 
   window.Whisper = window.Whisper || {};
 
-  const { Message: TypedMessage } = window.Signal.Types;
-  const { deleteAttachmentData } = window.Signal.Migrations;
+  const { Message: TypedMessage } = Signal.Types;
+  const { deleteAttachmentData } = Signal.Migrations;
 
   window.Whisper.Message = Backbone.Model.extend({
     database: Whisper.Database,