diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 61a58cda0..a8cef3c1c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -3,7 +3,8 @@
     v-if="!hideStatus"
     ref="root"
     class="Status"
-    :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]"
+    :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }, userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
+    :style="[ userStyle ]"
   >
     <div
       v-if="error"
@@ -120,8 +121,6 @@
 
       <div
         v-if="!deleted"
-        :class="[userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
-        :style="[ userStyle ]"
         class="status-container"
         :data-tags="tags"
       >
diff --git a/src/modules/instance.js b/src/modules/instance.js
index cc114505c..2281141f4 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -374,8 +374,6 @@ const instance = {
             // should have been "pack" field, that would be more useful
           }).sort(byPackThenByName)
           commit('setInstanceOption', { name: 'customEmoji', value: emoji })
-          state.standardEmojiGroupList = null
-          state.standardEmojiList = null
         } else {
           throw (res)
         }