diff --git a/next-tavla/app/(admin)/utils.ts b/next-tavla/app/(admin)/utils.ts
index 0da4b17fa..a13a32e92 100644
--- a/next-tavla/app/(admin)/utils.ts
+++ b/next-tavla/app/(admin)/utils.ts
@@ -103,6 +103,12 @@ export function getFormFeedbackForError(e: TError): TFormFeedback {
                 feedback: 'Denne personen er allerede medlem av organisasjoen.',
                 variant: 'info',
             }
+        case 'organization/name-missing':
+            return {
+                form_type: 'general',
+                feedback: 'Organisasjonen må ha et navn',
+                variant: 'warning',
+            }
     }
 
     return {
diff --git a/next-tavla/src/Admin/utils/formActions.ts b/next-tavla/src/Admin/utils/formActions.ts
index e6a61e427..9e2b31eca 100644
--- a/next-tavla/src/Admin/utils/formActions.ts
+++ b/next-tavla/src/Admin/utils/formActions.ts
@@ -75,6 +75,8 @@ export async function createOrganizationAction(
     try {
         const name = data.get('name')?.toString() ?? ''
 
+        if (!name) return getFormFeedbackForError('organization/name-missing')
+
         const user = await getUserFromSessionCookie()
 
         if (!user) return getFormFeedbackForError('auth/operation-not-allowed')