diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 4d3d48929e..a3d8a5d320 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -1609,6 +1609,7 @@ export async function createPaseoDaemon(
     detachAgentStoragePersistence();
     await agentStorage.flush().catch(() => undefined);
     await providerSnapshotManager.shutdown();
+    workspaceGitService.dispose();
     terminalManager.killAll();
     speechService.stop();
     await scheduleService.stop().catch(() => undefined);
diff --git a/packages/server/src/server/daemon-e2e/migration-host-automation.e2e.test.ts b/packages/server/src/server/daemon-e2e/migration-host-automation.e2e.test.ts
index 2fb42fe75c..607613f5f3 100644
--- a/packages/server/src/server/daemon-e2e/migration-host-automation.e2e.test.ts
+++ b/packages/server/src/server/daemon-e2e/migration-host-automation.e2e.test.ts
@@ -1,5 +1,5 @@
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdtempSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { connectHostAutomation, connectToDaemon } from "@getpaseo/client/node";
@@ -155,7 +155,8 @@ test("normalized checkout-name collisions cannot reuse another branch", async ()
     refName: "refs/heads/feature",
     directoryName: "foo-bar",
   });
-  expect(realpathSync(same.path)).toBe(realpathSync(first.path));
+  const firstStats = statSync(first.path);
+  expect(statSync(same.path)).toMatchObject({ dev: firstStats.dev, ino: firstStats.ino });
   await expect(
     paseo.ensureCheckout({
       rootPath: repoRoot,