diff --git a/src/components/notifications/DiplomaticNotifications.vue b/src/components/notifications/DiplomaticNotifications.vue
index 37c30f4..fe12e4c 100644
--- a/src/components/notifications/DiplomaticNotifications.vue
+++ b/src/components/notifications/DiplomaticNotifications.vue
@@ -19,7 +19,7 @@
           {{ t('diplomacy.markAllRead') }}
         </Button>
       </div>
-      <ScrollArea class="h-96">
+      <ScrollArea class="h-auto max-h-96">
         <Empty v-if="allNotifications.length === 0" class="border-0">
           <EmptyContent>
             <ScrollText class="h-10 w-10 text-muted-foreground" />
diff --git a/src/components/notifications/EnemyAlertNotifications.vue b/src/components/notifications/EnemyAlertNotifications.vue
index 1f45eba..e9e33c2 100644
--- a/src/components/notifications/EnemyAlertNotifications.vue
+++ b/src/components/notifications/EnemyAlertNotifications.vue
@@ -19,7 +19,7 @@
           {{ t('enemyAlert.markAllRead') }}
         </Button>
       </div>
-      <ScrollArea class="h-96">
+      <ScrollArea class="h-auto max-h-96">
         <Empty v-if="activeAlerts.length === 0" class="border-0">
           <EmptyContent>
             <Shield class="h-10 w-10 text-muted-foreground" />
diff --git a/src/components/notifications/QueueNotifications.vue b/src/components/notifications/QueueNotifications.vue
index 0e6df95..fb0dec7 100644
--- a/src/components/notifications/QueueNotifications.vue
+++ b/src/components/notifications/QueueNotifications.vue
@@ -32,7 +32,7 @@
           </TabsTrigger>
         </TabsList>
 
-        <ScrollArea class="h-[420px]">
+        <ScrollArea class="h-auto max-h-96">
           <TabsContent v-for="tab in tabConfig" :key="tab.value" :value="tab.value" class="mt-0">
             <Empty v-if="tab.items.length === 0" class="border-0">
               <EmptyContent>