diff --git a/lang/de.json b/lang/de.json
index 78b428d..079cd7e 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -554,4 +554,4 @@
     "nostr.course_text": "Unser Dozent :from hat einen neuen Kurs eingestellt:\n:name\n:description\n:url\n\n#Bitcoin #Einundzwanzig",
     "Einundzwanzig Community": "",
     "Allgemeine Bitcoin Community": ""
-}
\ No newline at end of file
+}
diff --git a/resources/views/livewire/meetups/create.blade.php b/resources/views/livewire/meetups/create.blade.php
index 9e6c486..f08f760 100644
--- a/resources/views/livewire/meetups/create.blade.php
+++ b/resources/views/livewire/meetups/create.blade.php
@@ -79,7 +79,7 @@ class extends Component {
             'nostr' => ['nullable', 'string', 'max:255'],
             'simplex' => ['nullable', 'string',],
             'signal' => ['nullable', 'string', 'max:510'],
-            'community' => ['nullable', 'string', 'max:255'],
+            'community' => ['required', 'string', 'max:255'],
             'visible_on_map' => ['boolean'],
         ]);
 
diff --git a/resources/views/livewire/meetups/edit.blade.php b/resources/views/livewire/meetups/edit.blade.php
index 7dcac53..759c29e 100644
--- a/resources/views/livewire/meetups/edit.blade.php
+++ b/resources/views/livewire/meetups/edit.blade.php
@@ -122,7 +122,7 @@ class extends Component {
             'nostr' => ['nullable', 'string', 'max:255'],
             'simplex' => ['nullable', 'string', 'max:255'],
             'signal' => ['nullable', 'string', 'max:255'],
-            'community' => ['nullable', 'string', 'max:255'],
+            'community' => ['required', 'string', 'max:255'],
         ]);
 
         // Convert github_data string back to array if provided
@@ -324,6 +324,7 @@ class extends Component {
                 <flux:field>
                     <flux:label>{{ __('Gemeinschaft') }}</flux:label>
                     <flux:select wire:model="community">
+                        <flux:select.option value="">{{ __('Keine') }}</flux:select.option>
                         <flux:select.option value="einundzwanzig">einundzwanzig</flux:select.option>
                         <flux:select.option value="bitcoin">bitcoin</flux:select.option>
                     </flux:select>
diff --git a/resources/views/livewire/meetups/landingpage.blade.php b/resources/views/livewire/meetups/landingpage.blade.php
index e6423ca..ecd2b9a 100644
--- a/resources/views/livewire/meetups/landingpage.blade.php
+++ b/resources/views/livewire/meetups/landingpage.blade.php
@@ -145,7 +145,15 @@ class extends Component {
                 @if($meetup->community)
                     <div>
                         <flux:heading size="sm" class="mb-2">Community</flux:heading>
-                        <p class="text-gray-700 dark:text-gray-300">{{ $meetup->community }}</p>
+                        <p class="text-gray-700 dark:text-gray-300">
+                            @if ($meetup->community === 'bitcoin')
+                                {{ __('Allgemeine Bitcoin Community') }}
+                            @elseif ($meetup->community === 'einundzwanzig')
+                                {{ __('Einundzwanzig Community') }}
+                            @else
+                                {{ $meetup->community }}
+                            @endif
+                        </p>
                     </div>
                 @endif
             </div>