diff --git a/site/src/components/Resources/AgentMetadata.tsx b/site/src/components/Resources/AgentMetadata.tsx
index 0fecc908a65ae..3825608b4bff3 100644
--- a/site/src/components/Resources/AgentMetadata.tsx
+++ b/site/src/components/Resources/AgentMetadata.tsx
@@ -241,18 +241,34 @@ export const AgentMetadata: FC<{
       setMetadata(storybookMetadata)
       return
     }
-    const source = watchAgentMetadata(agent.id)
 
-    source.onerror = (e) => {
-      console.error("received error in watch stream", e)
-    }
-    source.addEventListener("data", (e) => {
-      const data = JSON.parse(e.data)
-      setMetadata(data)
-    })
-    return () => {
-      source.close()
+    let timeout: NodeJS.Timeout | undefined = undefined
+
+    const connect = (): (() => void) => {
+      const source = watchAgentMetadata(agent.id)
+
+      source.onerror = (e) => {
+        console.error("received error in watch stream", e)
+        setMetadata(undefined)
+        source.close()
+
+        timeout = setTimeout(() => {
+          connect()
+        }, 3000)
+      }
+
+      source.addEventListener("data", (e) => {
+        const data = JSON.parse(e.data)
+        setMetadata(data)
+      })
+      return () => {
+        if (timeout !== undefined) {
+          clearTimeout(timeout)
+        }
+        source.close()
+      }
     }
+    return connect()
   }, [agent.id, watchAgentMetadata, storybookMetadata])
 
   if (metadata === undefined) {