diff --git a/app/Models/GithubApp.php b/app/Models/GithubApp.php
index 0b0e93b12..5550df81f 100644
--- a/app/Models/GithubApp.php
+++ b/app/Models/GithubApp.php
@@ -33,17 +33,30 @@ class GithubApp extends BaseModel
 
     public static function ownedByCurrentTeam()
     {
-        return GithubApp::whereTeamId(currentTeam()->id);
+        return GithubApp::where(function ($query) {
+            $query->where('team_id', currentTeam()->id)
+                ->orWhere('is_system_wide', true);
+        });
     }
 
     public static function public()
     {
-        return GithubApp::whereTeamId(currentTeam()->id)->whereisPublic(true)->whereNotNull('app_id')->get();
+        return GithubApp::where(function ($query) {
+            $query->where(function ($q) {
+                $q->where('team_id', currentTeam()->id)
+                    ->orWhere('is_system_wide', true);
+            })->where('is_public', true);
+        })->whereNotNull('app_id')->get();
     }
 
     public static function private()
     {
-        return GithubApp::whereTeamId(currentTeam()->id)->whereisPublic(false)->whereNotNull('app_id')->get();
+        return GithubApp::where(function ($query) {
+            $query->where(function ($q) {
+                $q->where('team_id', currentTeam()->id)
+                    ->orWhere('is_system_wide', true);
+            })->where('is_public', false);
+        })->whereNotNull('app_id')->get();
     }
 
     public function team()
diff --git a/app/Models/Team.php b/app/Models/Team.php
index 07959dd16..467cf45bc 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -248,15 +248,17 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsPushover, Sen
     {
         $sources = collect([]);
         $github_apps = GithubApp::where(function ($query) {
-            $query->where('team_id', $this->id)
-                ->Where('is_public', false)
-                ->orWhere('is_system_wide', true);
+            $query->where(function ($q) {
+                $q->where('team_id', $this->id)
+                    ->orWhere('is_system_wide', true);
+            })->where('is_public', false);
         })->get();
 
         $gitlab_apps = GitlabApp::where(function ($query) {
-            $query->where('team_id', $this->id)
-                ->Where('is_public', false)
-                ->orWhere('is_system_wide', true);
+            $query->where(function ($q) {
+                $q->where('team_id', $this->id)
+                    ->orWhere('is_system_wide', true);
+            })->where('is_public', false);
         })->get();
 
         return $sources->merge($github_apps)->merge($gitlab_apps);