diff --git a/services/api/src/resources/user/sql.ts b/services/api/src/resources/user/sql.ts
index f83b0ea7cb..8bf7d58202 100644
--- a/services/api/src/resources/user/sql.ts
+++ b/services/api/src/resources/user/sql.ts
@@ -15,14 +15,17 @@ export const Sql = {
       .select('user_ssh_key.usid')
       .toString(),
   deleteFromSshKeys: (id: string) =>
-    knex('ssh_key as sk')
-      .join('user_ssh_key as usk', 'sk.id', '=', 'usk.skid')
-      .where('usk.usid', '=', id)
+    knex('ssh_key')
+      .whereIn('id', function() {
+        this.select('skid')
+            .from('user_ssh_key')
+            .where('usid', id);
+      })
       .delete()
       .toString(),
   deleteFromUserSshKeys: (id: string) =>
-    knex('user_ssh_key ')
-      .where('usid', '=', id)
+    knex('user_ssh_key')
+      .where('usid', id)
       .delete()
       .toString(),
   selectUserIdBySshFingerprint: ({