diff --git a/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue b/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue
index 1e21afb2..285edeea 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSoundSet.vue
@@ -4,7 +4,7 @@
         icon="queue_music"
         :odd="odd"
         :loading="loading"
-        :show-more-menu="soundSet.customer_id"
+        :show-more-menu="showMoreMenu"
         @click="showSoundSetDetails"
     >
         <template
@@ -97,6 +97,12 @@ export default {
         ]),
         parent () {
             return this.soundSet.parent_id ? this.soundSetList.find((soundSet) => this.soundSet.parent_id === soundSet.id) : null
+        },
+        showMoreMenu () {
+            if (this.soundSet.customer_id) {
+                return true
+            }
+            return false
         }
     },
     methods: {
diff --git a/src/store/pbx-soundsets.js b/src/store/pbx-soundsets.js
index 74e4bfed..90eceaa4 100644
--- a/src/store/pbx-soundsets.js
+++ b/src/store/pbx-soundsets.js
@@ -187,7 +187,7 @@ export default {
             const index = state.soundSetList.findIndex((soundSetItem) => soundSetItem.id === soundSet.id)
             state.soundSetMap[soundSet.id] = soundSet
             state.soundSetList[index] = soundSet
-            if (state.soundSetSelected.id === soundSet.id) {
+            if (state?.soundSetSelected?.id === soundSet.id) {
                 state.soundSetSelected = soundSet
             }
         },