diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 03aec46e46..28eaa8123b 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -1034,7 +1034,7 @@ export const Commands = [
                     args = _t("sends confetti");
                     MatrixClientPeg.get().sendEmoteMessage(roomId, args);
                 } else {
-                    MatrixClientPeg.get().sendHtmlMessage(roomId, args);
+                    MatrixClientPeg.get().sendTextMessage(roomId, args);
                 }
                 if (!isChatEffectsDisabled) {
                     dis.dispatch({action: 'confetti'});
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index d5ccbf1c8c..92f43c75ca 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -189,6 +189,7 @@ export default createReactClass({
         this.context.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
         this.context.on("userTrustStatusChanged", this.onUserVerificationChanged);
         this.context.on("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
+        this.context.on("Event.decrypted", this.onEventDecrypted);
         // Start listening for RoomViewStore updates
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this._onRightPanelStoreUpdate);
@@ -511,6 +512,7 @@ export default createReactClass({
             this.context.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
             this.context.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
             this.context.removeListener("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
+            this.context.removeListener("Event.decrypted", this.onEventDecrypted);
         }
 
         window.removeEventListener('beforeunload', this.onPageUnload);
@@ -751,15 +753,16 @@ export default createReactClass({
                 });
             }
         }
-        if (!SettingsStore.getValue('dontShowChatEffects')) {
-            this.context.on("Event.decrypted", (ev) => {
-                if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
-                this.handleConfetti(ev);
-            });
-        }
+    },
+    onEventDecrypted(ev) {
+    if (!SettingsStore.getValue('dontShowChatEffects')) {
+        if (ev.isBeingDecrypted() || ev.isDecryptionFailure() ||
+            this.state.room.getUnreadNotificationCount() === 0) return;
+        this.handleConfetti(ev);
+    }
     },
     handleConfetti(ev) {
-        if (this.context.isInitialSyncComplete()) {
+        if (this.state.matrixClientIsReady) {
             const messageBody = _t('sends confetti');
             if (isConfettiEmoji(ev.getContent()) || ev.getContent().body === messageBody) {
                 dis.dispatch({action: 'confetti'});
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 6a7b2fc753..0b873a9bab 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -44,6 +44,8 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import {Action} from "../../../dispatcher/actions";
+import {isConfettiEmoji} from "../elements/Confetti";
+import SettingsStore from "../../../settings/SettingsStore";
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
@@ -313,6 +315,11 @@ export default class SendMessageComposer extends React.Component {
                 });
             }
             dis.dispatch({action: "message_sent"});
+            if (!SettingsStore.getValue('dontShowChatEffects')) {
+                if (isConfettiEmoji(content)) {
+                dis.dispatch({action: 'confetti'});
+                }
+            }
         }
 
         this.sendHistoryManager.save(this.model);