diff --git a/js/helpers.js b/js/helpers.js
index 0cebb359b..14542701d 100644
--- a/js/helpers.js
+++ b/js/helpers.js
@@ -205,21 +205,9 @@ window.textsecure.throwHumanError = function(error, type, humanError) {
     throw e;
 }
 
-;(function() {
-    'use strict';
-    window.textsecure = window.textsecure || {};
-    window.textsecure.NATIVE_CLIENT = window.textsecure.NATIVE_CLIENT || true;
-
-    if (!textsecure.NATIVE_CLIENT) {
-        window.textsecure.registerOnLoadFunction = window.textsecure.nativeclient.registerOnLoadFunction;
-    } else {
-        window.textsecure.registerOnLoadFunction = function(func) {
-            return new Promise(function(resolve, reject) {
-                return resolve(func());
-            });
-        };
-    }
-})();
+window.textsecure.registerOnLoadFunction = textsecure.registerOnLoadFunction || function(func) {
+    return Promise.resolve(func());
+};
 
 window.textsecure.replay = function() {
     var self = {};
diff --git a/js/nativeclient.js b/js/nativeclient.js
index 441f44b42..24f8fcaf7 100644
--- a/js/nativeclient.js
+++ b/js/nativeclient.js
@@ -16,6 +16,11 @@
 ;(function() {
     'use strict';
     window.textsecure = window.textsecure || {};
+    window.textsecure.NATIVE_CLIENT = window.textsecure.NATIVE_CLIENT || true;
+
+    if (!textsecure.NATIVE_CLIENT) {
+        window.textsecure.registerOnLoadFunction = window.textsecure.nativeclient.registerOnLoadFunction;
+    }
 
     var naclMessageNextId = 0;
     var naclMessageIdCallbackMap = {};