diff --git a/config/config.json b/config/config.json
index 61b81355..9eb83d56 100644
--- a/config/config.json
+++ b/config/config.json
@@ -106,7 +106,7 @@
         "live_game_duration": 30
     },
     "nba_scoreboard": {
-        "enabled": true,
+        "enabled": false,
         "test_mode": false,
         "update_interval_seconds": 300,
         "live_update_interval": 20,
diff --git a/src/nba_managers.py b/src/nba_managers.py
index 76a83933..28ec09e7 100644
--- a/src/nba_managers.py
+++ b/src/nba_managers.py
@@ -730,7 +730,8 @@ class NBARecentManager(BaseNBAManager):
             new_recent_games = []
             for event in events:
                 game = self._extract_game_details(event)
-                if game:
+                # Filter for recent games: must be final and within the time window
+                if game and game['is_final'] and game['is_within_window']:
                     new_recent_games.append(game)
             
             # Filter for favorite teams
diff --git a/src/nhl_managers.py b/src/nhl_managers.py
index ee6650ee..90857e42 100644
--- a/src/nhl_managers.py
+++ b/src/nhl_managers.py
@@ -768,7 +768,7 @@ class NHLUpcomingManager(BaseNHLManager):
             new_upcoming_games = []
             for event in events:
                 game = self._extract_game_details(event)
-                if game and not game['is_final'] and game['is_within_window']:
+                if game and not game['is_final'] and game['is_upcoming']:
                     new_upcoming_games.append(game)
             
             # Filter for favorite teams