diff --git a/site/src/modules/resources/AgentRow.stories.tsx b/site/src/modules/resources/AgentRow.stories.tsx
index a5ad16ae9f97b..c1bc40e98eb1d 100644
--- a/site/src/modules/resources/AgentRow.stories.tsx
+++ b/site/src/modules/resources/AgentRow.stories.tsx
@@ -286,10 +286,43 @@ export const GroupApp: Story = {
 };
 
 export const Devcontainer: Story = {
-	beforeEach: () => {
-		spyOn(API, "getAgentContainers").mockResolvedValue({
-			devcontainers: [M.MockWorkspaceAgentDevcontainer],
-			containers: [M.MockWorkspaceAgentContainer],
-		});
+	parameters: {
+		queries: [
+			{
+				key: ["agents", M.MockWorkspaceAgent.id, "containers"],
+				data: {
+					devcontainers: [M.MockWorkspaceAgentDevcontainer],
+					containers: [M.MockWorkspaceAgentContainer],
+				},
+			},
+		],
+		webSocket: [],
+	},
+};
+
+export const FoundDevcontainer: Story = {
+	args: {
+		agent: {
+			...M.MockWorkspaceAgentReady,
+		},
+	},
+	parameters: {
+		queries: [
+			{
+				key: ["agents", M.MockWorkspaceAgentReady.id, "containers"],
+				data: {
+					devcontainers: [
+						{
+							...M.MockWorkspaceAgentDevcontainer,
+							status: "stopped",
+							container: undefined,
+							agent: undefined,
+						},
+					],
+					containers: [],
+				},
+			},
+		],
+		webSocket: [],
 	},
 };
diff --git a/site/src/modules/resources/AgentRow.tsx b/site/src/modules/resources/AgentRow.tsx
index ab0e5884c48e9..3cf757a15c2ab 100644
--- a/site/src/modules/resources/AgentRow.tsx
+++ b/site/src/modules/resources/AgentRow.tsx
@@ -137,17 +137,16 @@ export const AgentRow: FC<AgentRowProps> = ({
 	// This is used to show the parent apps of the devcontainer.
 	const [showParentApps, setShowParentApps] = useState(false);
 
-	let shouldDisplayAppsSection = shouldDisplayAgentApps;
-	if (
-		devcontainers &&
-		devcontainers.find(
-			// We only want to hide the parent apps by default when there are dev
-			// containers that are either starting or running. If they are all in
-			// the stopped state, it doesn't make sense to hide the parent apps.
+	const anyRunningOrStartingDevcontainers =
+		devcontainers?.find(
 			(dc) => dc.status === "running" || dc.status === "starting",
-		) !== undefined &&
-		!showParentApps
-	) {
+		) !== undefined;
+
+	// We only want to hide the parent apps by default when there are dev
+	// containers that are either starting or running. If they are all in
+	// the stopped state, it doesn't make sense to hide the parent apps.
+	let shouldDisplayAppsSection = shouldDisplayAgentApps;
+	if (anyRunningOrStartingDevcontainers && !showParentApps) {
 		shouldDisplayAppsSection = false;
 	}
 
@@ -187,7 +186,7 @@ export const AgentRow: FC<AgentRowProps> = ({
 				</div>
 
 				<div className="flex items-center gap-2">
-					{devcontainers && devcontainers.length > 0 && (
+					{anyRunningOrStartingDevcontainers && (
 						<Button
 							variant="outline"
 							size="sm"