diff --git a/src/screens/VisualTests/BuildResults.tsx b/src/screens/VisualTests/BuildResults.tsx
index b3823d84..513da28f 100644
--- a/src/screens/VisualTests/BuildResults.tsx
+++ b/src/screens/VisualTests/BuildResults.tsx
@@ -31,7 +31,6 @@ interface BuildResultsProps {
   nextBuild: NextBuildFieldsFragment;
   switchToNextBuild?: () => void;
   startDevBuild: () => void;
-  isOutdated: boolean;
   isReviewing: boolean;
   onAccept: (testId: string, batch: ReviewTestBatch) => Promise<void>;
   onUnaccept: (testId: string) => Promise<void>;
@@ -43,7 +42,6 @@ export const BuildResults = ({
   nextBuild,
   switchToNextBuild,
   startDevBuild,
-  isOutdated,
   isReviewing,
   onAccept,
   onUnaccept,
@@ -57,18 +55,6 @@ export const BuildResults = ({
 
   const isRunningBuildInProgress = runningBuild && runningBuild.step !== "complete";
   const isReviewable = nextBuild.id === storyBuild.id;
-  const showBuildStatus =
-    // We always want to show the status of the running build (until it is done)
-    isRunningBuildInProgress ||
-    // Even if there's no build running, we want to show the next build if it hasn't been selected.
-    !isReviewable;
-  const runningBuildIsNextBuild = runningBuild && runningBuild?.buildId === nextBuild.id;
-  const buildStatus = showBuildStatus && (
-    <BuildProgress
-      runningBuild={(runningBuildIsNextBuild || isRunningBuildInProgress) && runningBuild}
-      switchToNextBuild={switchToNextBuild}
-    />
-  );
 
   const storyTests = [
     ...getFragment(
@@ -85,6 +71,20 @@ export const BuildResults = ({
   const isStorySuperseded =
     !isReviewable && nextStoryTests.every(({ status }) => status !== TestStatus.InProgress);
 
+  const showBuildStatus =
+    // We always want to show the status of the running build (until it is done)
+    isRunningBuildInProgress ||
+    // Even if there's no build running, we want to show the next build if it hasn't been selected,
+    // unless the story info itself is going to tell us to switch already
+    (!isReviewable && !(isStorySuperseded && switchToNextBuild));
+  const runningBuildIsNextBuild = runningBuild && runningBuild?.buildId === nextBuild.id;
+  const buildStatus = showBuildStatus && (
+    <BuildProgress
+      runningBuild={(runningBuildIsNextBuild || isRunningBuildInProgress) && runningBuild}
+      switchToNextBuild={switchToNextBuild}
+    />
+  );
+
   // It shouldn't be possible for one test to be skipped but not all of them
   const isSkipped = !!storyTests?.find((t) => t.result === TestResult.Skipped);
   if (isSkipped) {
diff --git a/src/screens/VisualTests/VisualTests.tsx b/src/screens/VisualTests/VisualTests.tsx
index f580deb3..1204d90f 100644
--- a/src/screens/VisualTests/VisualTests.tsx
+++ b/src/screens/VisualTests/VisualTests.tsx
@@ -139,6 +139,10 @@ export const VisualTests = ({
     data?.storyBuild ?? data?.project?.nextBuild
   );
 
+  // Currently only used by the sidebar button to show a blue dot ("build outdated")
+  const isOutdated = storyBuild?.uncommittedHash !== gitInfo.uncommittedHash;
+  useEffect(() => setOutdated(isOutdated), [isOutdated, setOutdated]);
+
   // If the next build is *newer* than the current commit, we don't want to switch to the build
   const nextBuildNewer = nextBuild && nextBuild.committedAt > gitInfo.committedAt;
   const canSwitchToNextBuild = nextBuild && !nextBuildNewer;
@@ -178,9 +182,6 @@ export const VisualTests = ({
   );
 
   const isRunningBuildStarting = runningBuild && !["success", "error"].includes(runningBuild.step);
-  const isOutdated = storyBuild?.uncommittedHash !== gitInfo.uncommittedHash;
-
-  useEffect(() => setOutdated(isOutdated), [isOutdated, setOutdated]);
 
   return !nextBuild || error ? (
     <NoBuild
@@ -201,7 +202,6 @@ export const VisualTests = ({
         nextBuild,
         switchToNextBuild: canSwitchToNextBuild && switchToNextBuild,
         startDevBuild,
-        isOutdated,
         isReviewing,
         onAccept,
         onUnaccept,