diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
index a0fe6cf811..1b16843b09 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
@@ -79,7 +79,6 @@ function pruneOldAvimojis() {
         });
 }
 
-
 function maybeClearTimeoutDelete() {
     if (defaultTimeout) {
         Script.clearTimeout(defaultTimeout);
@@ -157,6 +156,7 @@ function handleSelectedEmoji(emojiFilename) {
     }
 }
 
+
 function onDomainChanged() {
     resetEmojis();
 }
@@ -167,6 +167,14 @@ function onScaleChanged() {
 }
 
 
+function onAddingWearable(id) {
+    var props = Entities.getEntityProperties(id, ["name"]);
+    if (props.name.toLowerCase().indexOf("avimoji") > -1) {
+        Entities.deleteEntity(id);
+    }
+}
+
+
 // #endregion
 // *************************************
 // END ui_handlers
@@ -179,7 +187,13 @@ function onScaleChanged() {
 
 
 // what happens when we need to add an emoji over a user
+var firstEmojiMadeOnStartup = false;
 function addEmoji(emojiFilename) {
+    if (!firstEmojiMadeOnStartup) {
+        firstEmojiMadeOnStartup = true;
+        Entities.addingWearable.disconnect(onAddingWearable);
+    }
+
     if (currentEmoji) {
         resetEmojis();
     }
@@ -418,6 +432,7 @@ function startup() {
     Script.scriptEnding.connect(unload);
     Window.domainChanged.connect(onDomainChanged);
     MyAvatar.scaleChanged.connect(onScaleChanged);
+    Entities.addingWearable.connect(onAddingWearable);
     signalsConnected = true;
 
     function AviMoji() {
@@ -457,6 +472,10 @@ function unload() {
     if (signalsConnected) {
         Window.domainChanged.disconnect(onDomainChanged);
         MyAvatar.scaleChanged.disconnect(onScaleChanged);
+        if (!firstEmojiMadeOnStartup) {
+            Entities.addingWearable.disconnect(onAddingWearable);
+        }
+
         signalsConnected = false;
     }
 }
diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
index abf0dd73e8..f76ef72a33 100644
--- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
+++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
@@ -543,7 +543,7 @@ function onDisplayModeChanged(isHMDMode) {
 }
 
 
-var emojiAPI = Script.require("./emojiApp/simplifiedEmoji.js");
+var emojiAPI = Script.require("./emojiApp/simplifiedEmoji.js?" + Date.now());
 var keyPressSignalsConnected = false;
 var emojiCodeMap;
 var customEmojiCodeMap;
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index c388c594c9..affa6896d8 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -584,7 +584,7 @@ function restoreLODSettings() {
 
 
 var nametag = Script.require("./simplifiedNametag/simplifiedNametag.js?" + Date.now());
-var si = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now())
+var si = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now());
 var emote = Script.require("../simplifiedEmote/simplifiedEmote.js?" + Date.now());
 var oldShowAudioTools;
 var oldShowBubbleTools;