diff --git a/tine20/Tinebase/js/TineDock/TineDock.vue b/tine20/Tinebase/js/TineDock/TineDock.vue
index 5cc3abec5c..1df581e715 100644
--- a/tine20/Tinebase/js/TineDock/TineDock.vue
+++ b/tine20/Tinebase/js/TineDock/TineDock.vue
@@ -75,7 +75,7 @@
 <script setup>
 /* eslint-disable vue/no-mutating-props */
 /* eslint-disable */
-import {computed, ref, watch, inject, onMounted, onUpdated} from 'vue'
+import {computed, ref, watch, inject, onMounted, onUpdated, onBeforeMount} from 'vue'
 import {useScroll, useWindowSize} from '@vueuse/core'
 import TMenu from "../vue/components/TMenu.vue";
 
@@ -129,7 +129,7 @@ const dockedAppsInternal = computed(() => {
       return _.find(availableApps.value, availableApp => {
         return availableApp.name === appName
       })
-    })
+    }).filter(app => app)
     : []
 })
 
@@ -182,6 +182,12 @@ const dragEnd = () => {
 
 // hiding the dock for small screen devices
 const { width } = useWindowSize()
+onBeforeMount(() => {
+  const diff = _.difference(props.state.dockedApps, dockedAppsInternal.value.map(el => el.name))
+  if (diff.length) {
+    _.remove(props.state.dockedApps, (app) => diff.includes(app))
+  }
+})
 onMounted(() => {
   const t = Tine.Tinebase.MainScreen.getDock()
   if(width.value <= 500){