diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 9e881991c..9a06c4e69 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -411,7 +411,7 @@ const Popover = {
     if (!scrollable) scrollable = window
     this.scrollable = scrollable
     let parent = this.$parent
-    while (parent?.$.type.name !== 'Popover') {
+    while (parent && parent.$.type.name !== 'Popover') {
       parent = parent.$parent
     }
     this.parentPopover = parent
diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.vue b/src/components/settings_modal/admin_tabs/emoji_tab.vue
index c3bcd75b4..98b501266 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.vue
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.vue
@@ -343,7 +343,7 @@
           <li>
             <div class="meta-buttons">
               <button
-                v-if="pack?.remote === undefined"
+                v-if="pack && pack.remote === undefined"
                 class="button button-default btn"
                 type="button"
                 @click="savePackMetadata"
@@ -351,7 +351,7 @@
                 {{ $t('admin_dash.emoji.save_meta') }}
               </button>
               <button
-                v-if="pack?.remote === undefined"
+                v-if="pack && pack.remote === undefined"
                 class="button button-default btn"
                 type="button"
                 @click="savePackMetadata"