diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
index b56c879b13..72b54e13bb 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
@@ -89,6 +89,7 @@ export const ObjectOptionsDropdownLayoutContent = () => {
     if (availableFieldsForKanban.length === 0) {
       navigateToSelectSettings();
       closeDropdown(dropdownId);
+      return;
     }
     if (currentView?.type !== ViewType.Kanban) {
       await setAndPersistViewType(ViewType.Kanban);
@@ -102,6 +103,7 @@ export const ObjectOptionsDropdownLayoutContent = () => {
     if (availableFieldsForCalendar.length === 0) {
       navigateToDateFieldSettings();
       closeDropdown(dropdownId);
+      return;
     }
     if (currentView?.type !== ViewType.Calendar) {
       await setAndPersistViewType(ViewType.Calendar);