diff --git a/src/components/admin/machines/admin-machine-details.client.tsx b/src/components/admin/machines/admin-machine-details.client.tsx
index da9ad27..efce860 100644
--- a/src/components/admin/machines/admin-machine-details.client.tsx
+++ b/src/components/admin/machines/admin-machine-details.client.tsx
@@ -28,6 +28,11 @@ export function AdminMachineDetailsClient({ tenantId: _tenantId, machineId }: {
   const [loadError, setLoadError] = useState<string | null>(null)
   const [retryTick, setRetryTick] = useState(0)
   const shouldLoad = fallback === undefined && Boolean(machineId)
+  const [isHydrated, setIsHydrated] = useState(false)
+
+  useEffect(() => {
+    setIsHydrated(true)
+  }, [])
 
   useEffect(() => {
     if (!shouldLoad) {
@@ -157,6 +162,18 @@ export function AdminMachineDetailsClient({ tenantId: _tenantId, machineId }: {
   const isLoading = single === undefined && fallback === undefined && !loadError
   const isNotFound = (single === null || fallback === null) && !loadError
 
+  if (!isHydrated) {
+    return (
+      <Card>
+        <CardContent className="space-y-3 p-6">
+          <Skeleton className="h-6 w-64" />
+          <Skeleton className="h-4 w-80" />
+          <Skeleton className="h-48 w-full" />
+        </CardContent>
+      </Card>
+    )
+  }
+
   const onRetry = () => {
     setLoadError(null)
     setFallback(undefined)