diff --git a/webapp/src/Controller/API/TeamController.php b/webapp/src/Controller/API/TeamController.php
index db5e8f017e..27788adb34 100644
--- a/webapp/src/Controller/API/TeamController.php
+++ b/webapp/src/Controller/API/TeamController.php
@@ -308,7 +308,8 @@ protected function getQueryBuilder(Request $request): QueryBuilder
             ->leftJoin('t.category', 'tc')
             ->leftJoin('t.contests', 'c')
             ->leftJoin('tc.contests', 'cc')
-            ->select('t, ta');
+            ->select('t, ta')
+            ->andWhere('t.enabled = 1');
 
         if ($request->query->has('category')) {
             $queryBuilder
diff --git a/webapp/src/Controller/Jury/TeamController.php b/webapp/src/Controller/Jury/TeamController.php
index fbc4f2485c..54522fcf26 100644
--- a/webapp/src/Controller/Jury/TeamController.php
+++ b/webapp/src/Controller/Jury/TeamController.php
@@ -241,6 +241,10 @@ public function viewAction(
             throw new NotFoundHttpException(sprintf('Team with ID %s not found', $teamId));
         }
 
+        if (!$team->getEnabled()) {
+            $this->addFlash('danger', 'Team is disabled and currently excluded from the scoreboard');
+        }
+
         $data = [
             'refresh' => [
                 'after' => 15,