diff --git a/app/Utilities/Reports.php b/app/Utilities/Reports.php
index e4f0d247f..67b0f45fb 100644
--- a/app/Utilities/Reports.php
+++ b/app/Utilities/Reports.php
@@ -26,7 +26,7 @@ class Reports
         Module::enabled()->each(function ($module) use (&$list) {
             $m = module($module->alias);
 
-            if (!$m || empty($m->get('reports'))) {
+            if (! $m || $m->disabled() || empty($m->get('reports'))) {
                 return;
             }
 
@@ -38,12 +38,6 @@ class Reports
                 continue;
             }
 
-            $alias = static::getModuleAlias($class);
-
-            if (! empty($alias) && (new Reports)->moduleIsDisabled($alias)) {
-                continue;
-            }
-
             $classes[$class] = static::getDefaultName($class);
         }
 
@@ -60,7 +54,7 @@ class Reports
             return false;
         }
 
-        if ($model->alias != 'core' && (new Reports)->moduleIsDisabled($model->alias)) {
+        if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
             return false;
         }
 
diff --git a/app/Utilities/Widgets.php b/app/Utilities/Widgets.php
index 37f706c84..b9a97a7e4 100644
--- a/app/Utilities/Widgets.php
+++ b/app/Utilities/Widgets.php
@@ -36,7 +36,7 @@ class Widgets
 
             $m = module($module->alias);
 
-            if (! $m || empty($m->get('widgets'))) {
+            if (! $m || $m->disabled() || empty($m->get('widgets'))) {
                 return;
             }
 
@@ -48,12 +48,6 @@ class Widgets
                 continue;
             }
 
-            $alias = static::getModuleAlias($class); 
-
-            if (! empty($alias) && (new Widgets)->moduleIsDisabled($alias)) {
-                continue;
-            }
-
             $classes[$class] = static::getDefaultName($class);
         }
 
@@ -71,7 +65,7 @@ class Widgets
 
             $model = Widget::where('dashboard_id', session('dashboard_id'))->where('class', $class_name)->first();
 
-            if ($model->alias != 'core' && (new Widgets)->moduleIsDisabled($model->alias)) {
+            if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
                 return false;
             }
 
@@ -92,7 +86,7 @@ class Widgets
                 return false;
             }
 
-            if ($model->alias != 'core' && (new Widgets)->moduleIsDisabled($model->alias)) {
+            if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
                 return false;
             }