diff --git a/src/backend/Zentral.API/Services/ModuleService.cs b/src/backend/Zentral.API/Services/ModuleService.cs
index 9964615..5443a68 100644
--- a/src/backend/Zentral.API/Services/ModuleService.cs
+++ b/src/backend/Zentral.API/Services/ModuleService.cs
@@ -60,7 +60,7 @@ public class ModuleService
                 .ThenBy(m => m.Name)
                 .ToListAsync();
 
-            return modules.Where(m => m.IsCore || (m.Subscription?.IsValid() ?? false)).ToList();
+            return modules.Where(m => m.IsCore || ((m.Subscription?.IsEnabled ?? false) && (m.Subscription?.IsValid() ?? false))).ToList();
         }) ?? new List<AppModule>();
     }