diff --git a/src/components/pages/PbxConfiguration/CscPbxCallQueue.vue b/src/components/pages/PbxConfiguration/CscPbxCallQueue.vue
index a4c62b28..3ee87824 100644
--- a/src/components/pages/PbxConfiguration/CscPbxCallQueue.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxCallQueue.vue
@@ -49,7 +49,7 @@
                 :error-message="queueMaxLengthErrorMessage"
                 :disable="disableMaxQueueLength"
                 @update:model-value="v$.changes.max_queue_length.$touch()"
-                @keyup.enter="save"
+                @keyup.enter="saveMaxQueueLength"
             >
                 <template
                     v-if="hasMaxQueueLengthChanged"
@@ -57,7 +57,7 @@
                 >
                     <csc-input-button-save
                         v-if="v$.changes.max_queue_length.$errors.length <= 0"
-                        @click.stop="save"
+                        @click.stop="saveMaxQueueLength"
                     />
                     <csc-input-button-reset
                         @click.stop="resetMaxQueueLength"
@@ -72,7 +72,7 @@
                 :error-message="queueWrapUpTimeErrorMessage"
                 :disable="disableQueueWrapUpTime"
                 @update:model-value="v$.changes.queue_wrap_up_time.$touch()"
-                @keyup.enter="save"
+                @keyup.enter="saveQueueWrapUpTime"
             >
                 <template
                     v-if="hasQueueWrapUpTimeChanged"
@@ -80,7 +80,7 @@
                 >
                     <csc-input-button-save
                         v-if="v$.changes.queue_wrap_up_time.$errors.length <= 0"
-                        @click.stop="save"
+                        @click.stop="saveQueueWrapUpTime"
                     />
                     <csc-input-button-reset
                         @click.stop="resetQueueWrapUpTime"
@@ -143,7 +143,7 @@ export default {
         },
         defaultQueueWrapUpTime: {
             type: Number,
-            default: 300
+            default: 10
         }
     },
     emits: ['save-queue-wrap-up-time', 'save-max-queue-length', 'expand', 'collapse', 'remove'],
@@ -262,13 +262,15 @@ export default {
                 queue_wrap_up_time: this.callQueue.queue_wrap_up_time || this.defaultQueueWrapUpTime
             }
         },
-        save () {
+        saveMaxQueueLength () {
             if (this.hasMaxQueueLengthChanged && this.v$.changes.max_queue_length.$errors.length <= 0) {
                 this.$emit('save-max-queue-length', {
                     callQueueId: this.callQueue.id,
                     maxQueueLength: this.changes.max_queue_length
                 })
             }
+        },
+        saveQueueWrapUpTime () {
             if (this.hasQueueWrapUpTimeChanged && this.v$.changes.queue_wrap_up_time.$errors.length <= 0) {
                 this.$emit('save-queue-wrap-up-time', {
                     callQueueId: this.callQueue.id,
diff --git a/src/components/pages/PbxConfiguration/CscPbxCallQueueAddForm.vue b/src/components/pages/PbxConfiguration/CscPbxCallQueueAddForm.vue
index 9e3ee5a8..9a3a5556 100644
--- a/src/components/pages/PbxConfiguration/CscPbxCallQueueAddForm.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxCallQueueAddForm.vue
@@ -95,7 +95,7 @@ export default {
         },
         defaultQueueWrapUpTime: {
             type: Number,
-            default: 300
+            default: 10
         }
     },
     emits: ['submit', 'cancel', 'ready'],
diff --git a/src/pages/CscPagePbxCallQueues.vue b/src/pages/CscPagePbxCallQueues.vue
index d07c7992..27b5e8a1 100644
--- a/src/pages/CscPagePbxCallQueues.vue
+++ b/src/pages/CscPagePbxCallQueues.vue
@@ -29,7 +29,7 @@
                     :options="getSubscriberOptions"
                     :subscriber-options-loading="isSubscribersRequesting"
                     :default-max-queue-length="defaultMaxQueueLength"
-                    :default-wrap-up-time="defaultQueueWrapUpTime"
+                    :default-queue-wrap-up-time="defaultQueueWrapUpTime"
                     @cancel="disableCallQueueAddForm"
                     @submit="createCallQueue"
                     @ready="loadSubscribers"
@@ -89,6 +89,7 @@ import CscRemoveDialog from 'components/CscRemoveDialog'
 import CscPbxCallQueue from 'components/pages/PbxConfiguration/CscPbxCallQueue'
 import CscPbxCallQueueAddForm from 'components/pages/PbxConfiguration/CscPbxCallQueueAddForm'
 import CscFade from 'components/transitions/CscFade'
+import { getSubscriberId } from 'src/auth'
 import {
     showGlobalError,
     showToast
@@ -192,7 +193,7 @@ export default {
         }
     },
     mounted () {
-        this.loadCallQueueList()
+        this.loadCallQueueList({ subscriberId: getSubscriberId() })
     },
     methods: {
         ...mapActions('pbx', [
diff --git a/src/pages/CscPagePbxSettingsCallQueues.vue b/src/pages/CscPagePbxSettingsCallQueues.vue
index 4beb889d..f56f8d1c 100644
--- a/src/pages/CscPagePbxSettingsCallQueues.vue
+++ b/src/pages/CscPagePbxSettingsCallQueues.vue
@@ -87,7 +87,7 @@ export default {
         return {
             callQueue: null,
             changes: null,
-            cloud_pbx_callqueue: null,
+            cloud_pbx_callqueue: false,
             v$: useValidate()
         }
     },
diff --git a/src/store/pbx-callqueues.js b/src/store/pbx-callqueues.js
index e8ac5ee8..4d3367c7 100644
--- a/src/store/pbx-callqueues.js
+++ b/src/store/pbx-callqueues.js
@@ -7,6 +7,7 @@ import {
     setCallQueueMaxLength,
     setCallQueueWrapUpTime
 } from 'src/api/pbx-callqueues'
+import { getPreferences } from 'src/api/subscriber'
 import { CreationState, RequestState } from 'src/store/common'
 
 export default {
@@ -186,28 +187,32 @@ export default {
         },
         collapseCallQueue (state) {
             state.callQueueSelected = null
+        },
+        setDefaultQueueWrapUpTime (state, value) {
+            state.defaultQueueWrapUpTime = value
         }
     },
     actions: {
-        loadCallQueueList (context, options) {
-            return new Promise((resolve) => {
-                const listVisible = _.get(options, 'listVisible', false)
-                const selectedId = _.get(options, 'selectedId', null)
-                context.commit('callQueueListRequesting', {
-                    listVisible
-                })
-                getCallQueueList().then((callQueueList) => {
-                    context.commit('callQueueListSucceeded', callQueueList)
-                    if (selectedId !== null) {
-                        context.commit('expandCallQueue', callQueueList)
-                        context.commit('highlightCallQueue', callQueueList)
-                    }
-                    resolve()
-                }).catch(() => {
-                    resolve()
-                    context.commit('callQueueListSucceeded')
-                })
-            })
+        async loadCallQueueList (context, options) {
+            const subscriberId = _.get(options, 'subscriberId', null)
+            const listVisible = _.get(options, 'listVisible', false)
+            const selectedId = _.get(options, 'selectedId', null)
+            context.commit('callQueueListRequesting', { listVisible })
+            try {
+                const callQueueList = await getCallQueueList()
+                context.commit('callQueueListSucceeded', callQueueList)
+
+                const subscriberPreferences = await getPreferences(subscriberId)
+                const wrapUpTime = _.get(subscriberPreferences, 'queue_wrap_up_time', 10)
+                context.commit('setDefaultQueueWrapUpTime', wrapUpTime)
+
+                if (selectedId !== null) {
+                    context.commit('expandCallQueue', callQueueList)
+                    context.commit('highlightCallQueue', callQueueList)
+                }
+            } catch (err) {
+                context.commit('callQueueListFailed', err.message)
+            }
         },
         createCallQueue (context, callQueueData) {
             context.commit('callQueueCreationRequesting', callQueueData)