diff --git a/app/Http/Controllers/Modules/My.php b/app/Http/Controllers/Modules/My.php
index f42c6f645..5d261dc21 100644
--- a/app/Http/Controllers/Modules/My.php
+++ b/app/Http/Controllers/Modules/My.php
@@ -22,7 +22,7 @@ class My extends Controller
 
         $purchased = $this->getMyModules();
         $modules = $this->getInstalledModules();
-        $installed = Module::all()->pluck('status', 'alias')->toArray();
+        $installed = Module::where('company_id', '=', session('company_id'))->pluck('status', 'alias')->toArray();
 
         return view('modules.my.index', compact('purchased', 'modules', 'installed'));
     }
diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php
index 7444eb29a..1818b3e83 100644
--- a/app/Traits/Modules.php
+++ b/app/Traits/Modules.php
@@ -8,6 +8,7 @@ use File;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use Module;
+use App\Models\Module\Module as MModule;
 use ZipArchive;
 use Cache;
 use Date;
@@ -103,8 +104,13 @@ trait Modules
 
         $installed = [];
         $modules = Module::all();
+        $installed_modules = MModule::where('company_id', '=', session('company_id'))->pluck('status', 'alias')->toArray();
 
         foreach ($modules as $module) {
+            if (!array_key_exists($module->alias, $installed_modules)) {
+                continue;
+            }
+
             $result = $this->getModule($module->alias);
 
             if ($result) {