diff --git a/src/backend/database/routes/ssh.ts b/src/backend/database/routes/ssh.ts
index aeb69458..45336a2f 100644
--- a/src/backend/database/routes/ssh.ts
+++ b/src/backend/database/routes/ssh.ts
@@ -10,6 +10,7 @@ import {
   fileManagerShortcuts,
   sshFolders,
   commandHistory,
+  recentActivity,
 } from "../db/schema.js";
 import { eq, and, desc, isNotNull, or } from "drizzle-orm";
 import type { Request, Response } from "express";
@@ -929,6 +930,24 @@ router.delete(
           ),
         );
 
+      await db
+        .delete(sshCredentialUsage)
+        .where(
+          and(
+            eq(sshCredentialUsage.hostId, numericHostId),
+            eq(sshCredentialUsage.userId, userId),
+          ),
+        );
+
+      await db
+        .delete(recentActivity)
+        .where(
+          and(
+            eq(recentActivity.hostId, numericHostId),
+            eq(recentActivity.userId, userId),
+          ),
+        );
+
       // Now delete the host itself
       await db
         .delete(sshData)