diff --git a/app/Http/Controllers/Admin/CreateNewContent.php b/app/Http/Controllers/Admin/CreateNewContent.php
index a41067d0..cf71a7e8 100644
--- a/app/Http/Controllers/Admin/CreateNewContent.php
+++ b/app/Http/Controllers/Admin/CreateNewContent.php
@@ -12,8 +12,8 @@ use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Modules\Categories\Entities\Category;
+use Pingpong\Modules\Facades\Module as ModuleInstance;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
 class CreateNewContent extends Controller
 {
     /**
@@ -47,10 +47,11 @@ class CreateNewContent extends Controller
         $templates = Template::where('module_id', $moduleId)
                              ->select(['template_name', 'name', 'description'])
                              ->get();
+        $categoryModule = ModuleInstance::get('categories');
 
         // add categories, if supported
         $categories = [];
-        if ($module->support_categories) {
+        if ($module->support_categories && $categoryModule->enabled()) {
             $categories = Category::where('module_id', $moduleId)
                                   ->get();
         }
diff --git a/app/Http/Controllers/Admin/EditContent.php b/app/Http/Controllers/Admin/EditContent.php
index d9781b4a..cae69a9a 100644
--- a/app/Http/Controllers/Admin/EditContent.php
+++ b/app/Http/Controllers/Admin/EditContent.php
@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Modules\Categories\Entities\Category;
+use Pingpong\Modules\Facades\Module as ModuleInstance;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditContent extends Controller
@@ -63,9 +64,11 @@ class EditContent extends Controller
                              ->select(['template_name', 'name', 'description'])
                              ->get();
 
+        $categoryModule = ModuleInstance::get('categories');
+
         // add categories, if supported
         $categories = [];
-        if ($module->support_categories) {
+        if ($module->support_categories && $categoryModule->enabled()) {
             $categories = Category::where('module_id', $moduleId)
                                   ->get();
         }