diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
index d3ec9da32d..709f0c9aeb 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
@@ -416,7 +416,6 @@ function init() {
 
     Window.domainChanged.connect(onDomainChanged);
     MyAvatar.scaleChanged.connect(onScaleChanged);
-    Script.scriptEnding.connect(scriptEnding);
     signalsConnected = true;
 }
 
@@ -431,18 +430,6 @@ function init() {
 // *************************************
 // #region cleanup
 
-
-function scriptEnding() {
-    resetEmojis();
-    if (signalsConnected) {
-        Script.scriptEnding.disconnect(scriptEnding);
-        Window.domainChanged.disconnect(onDomainChanged);
-        MyAvatar.scaleChanged.disconnect(onScaleChanged);
-        signalsConnected = false;
-    }
-}
-
-
 // #endregion
 // *************************************
 // END cleanup
@@ -476,7 +463,12 @@ function addEmojiFromQML(code) {
 }
 
 function unload() {
-    scriptEnding();
+    resetEmojis();
+    if (signalsConnected) {
+        Window.domainChanged.disconnect(onDomainChanged);
+        MyAvatar.scaleChanged.disconnect(onScaleChanged);
+        signalsConnected = false;
+    }
 }
 
 function startup() {
diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
index ab2cef7cb2..2fcb3dbb15 100644
--- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
+++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
@@ -587,7 +587,6 @@ function init() {
     Controller.keyReleaseEvent.connect(keyReleaseHandler);
     keyPressSignalsConnected = true;
 
-    Script.scriptEnding.connect(shutdown);
 }