diff --git a/changelog/unreleased/bugfix-modal-initial-focus b/changelog/unreleased/bugfix-modal-initial-focus
new file mode 100644
index 000000000..5e876702f
--- /dev/null
+++ b/changelog/unreleased/bugfix-modal-initial-focus
@@ -0,0 +1,5 @@
+Bugfix: Initial focus in OcModal
+
+We've fixed a bug that was introduced in the last version, where the initial focus element provided via the focusTrapInitial property was broken.
+
+https://github.com/owncloud/owncloud-design-system/pull/2001
diff --git a/src/components/organisms/OcModal/OcModal.vue b/src/components/organisms/OcModal/OcModal.vue
index 1d89d2c6f..fd0a3f6c8 100644
--- a/src/components/organisms/OcModal/OcModal.vue
+++ b/src/components/organisms/OcModal/OcModal.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="oc-modal-background" aria-labelledby="oc-modal-title">
-    <focus-trap :active="true" :initial-focus="getInitialFocusRef">
+    <focus-trap :active="true" :initial-focus="initialFocusRef">
       <div
         ref="ocModal"
         :class="classes"
@@ -246,6 +246,14 @@ export default {
     }
   },
   computed: {
+    initialFocusRef() {
+      if (this.focusTrapInitial) {
+        return this.focusTrapInitial
+      }
+      return () => {
+        return this.$refs.ocModalInput || this.$refs.ocModal
+      }
+    },
     classes() {
       return ["oc-modal", `oc-modal-${this.variation}`]
     },
@@ -285,9 +293,6 @@ export default {
     inputAssignPropAsValue(value) {
       this.userInputValue = value
     },
-    getInitialFocusRef() {
-      return this.focusTrapInitial || this.$refs.ocModalInput || this.$refs.ocModal
-    },
   },
 }
 </script>