diff --git a/src/lib/features/metrics/instance/instance-service.ts b/src/lib/features/metrics/instance/instance-service.ts
index 05b4c136c7..315d3a16e4 100644
--- a/src/lib/features/metrics/instance/instance-service.ts
+++ b/src/lib/features/metrics/instance/instance-service.ts
@@ -103,7 +103,7 @@ export default class ClientInstanceService {
     ): Promise<void> {
         const value = await clientRegisterSchema.validateAsync(data);
         value.clientIp = clientIp;
-        value.createdBy = clientIp;
+        value.createdBy = SYSTEM_USER.username!;
         this.seenClients[this.clientKey(value)] = value;
         this.eventStore.emit(CLIENT_REGISTER, value);
     }