diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index e4a42411..e60c33af 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -92,7 +92,7 @@ export default class VaultLinkPlugin extends Plugin {
 	}
 
 	public onunload(): void {
-		this.client.onunload();
+		this.client.stop();
 	}
 
 	public openSettings(): void {
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index acbe098e..1d3b33fc 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -138,7 +138,7 @@ export class SyncClient {
 		this.logger.reset();
 	}
 
-	public onunload(): void {
+	public stop(): void {
 		if (this.remoteListenerIntervalId !== null) {
 			clearInterval(this.remoteListenerIntervalId);
 		}
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 31524207..2e320819 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -91,6 +91,7 @@ export class MockAgent extends MockClient {
 		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
 		await this.client.syncer.applyRemoteChangesLocally();
+		this.client.stop();
 	}
 
 	public assertFileSystemIsConsistent(): void {