diff --git a/web/templates/status_emoji.hbs b/web/templates/status_emoji.hbs
index 7986c64967..f9558148d1 100644
--- a/web/templates/status_emoji.hbs
+++ b/web/templates/status_emoji.hbs
@@ -1,12 +1,12 @@
-{{#if .}}
-{{#if emoji_alt_code}}
+{{~#if . ~}}
+{{~#if emoji_alt_code ~}}
 <span class="emoji_alt_code">&nbsp;:{{emoji_name}}:</span>
-{{else if still_url}}
+{{~else if still_url ~}}
 <img src="{{still_url}}" class="emoji status-emoji status-emoji-name" data-animated-url="{{url}}" data-still-url="{{still_url}}" data-tippy-content=":{{emoji_name}}:" />
-{{else if url}}
-{{!-- note that we have no still_url --}}
+{{~else if url ~}}
+{{~!-- note that we have no still_url --~}}
 <img src="{{url}}" class="emoji status-emoji status-emoji-name" data-animated-url="{{url}}" data-tippy-content=":{{emoji_name}}:" />
-{{else if emoji_name}}
+{{~else if emoji_name ~}}
 <span class="emoji status-emoji status-emoji-name emoji-{{emoji_code}}" data-tippy-content=":{{emoji_name}}:"></span>
-{{/if}}
-{{/if}}
+{{~/if ~}}
+{{~/if ~}}
diff --git a/web/templates/user_with_status_icon.hbs b/web/templates/user_with_status_icon.hbs
index 2d6d253170..0a5052bdde 100644
--- a/web/templates/user_with_status_icon.hbs
+++ b/web/templates/user_with_status_icon.hbs
@@ -1,4 +1,5 @@
 <span class="user_status_icon_wrapper">
     <span class="user-name">{{name}}</span>
-    {{> status_emoji status_emoji_info}}
+    {{~> status_emoji status_emoji_info ~}}
 </span>
+{{~!-- --~}}