diff --git a/backend/src/models/machineIdentity.ts b/backend/src/models/machineIdentity.ts
index 830d74dd5..81a4bf20e 100644
--- a/backend/src/models/machineIdentity.ts
+++ b/backend/src/models/machineIdentity.ts
@@ -118,4 +118,6 @@ const machineIdentitySchema = new Schema(
     }
 );
 
+machineIdentitySchema.index({ clientId: 1, isActive: 1 })
+
 export const MachineIdentity = model<IMachineIdentity>("MachineIdentity", machineIdentitySchema);
\ No newline at end of file