diff --git a/packages/auth/src/Bootstrap/Container.ts b/packages/auth/src/Bootstrap/Container.ts
index 8c5029ea9..0772e32ce 100644
--- a/packages/auth/src/Bootstrap/Container.ts
+++ b/packages/auth/src/Bootstrap/Container.ts
@@ -981,6 +981,7 @@ export class ContainerConfigLoader {
           container.get(TYPES.Auth_GenerateRecoveryCodes),
           container.get(TYPES.Auth_Logger),
           container.get(TYPES.Auth_SessionService),
+          container.get(TYPES.Auth_TRANSITION_MODE_ENABLED),
         ),
       )
     container
diff --git a/packages/auth/src/Controller/AuthController.ts b/packages/auth/src/Controller/AuthController.ts
index 712b70a84..d1b32d8b9 100644
--- a/packages/auth/src/Controller/AuthController.ts
+++ b/packages/auth/src/Controller/AuthController.ts
@@ -37,6 +37,7 @@ export class AuthController implements UserServerInterface {
     private doGenerateRecoveryCodes: GenerateRecoveryCodes,
     private logger: Logger,
     private sessionService: SessionServiceInterface,
+    private transitionModeEnabled: boolean,
   ) {}
 
   async update(_params: UserUpdateRequestParams): Promise<HttpResponse<UserUpdateResponse>> {
@@ -227,11 +228,13 @@ export class AuthController implements UserServerInterface {
     if (userUuid !== null) {
       headers = new Map([['x-invalidate-cache', userUuid]])
 
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createTransitionRequestedEvent({
-          userUuid,
-        }),
-      )
+      if (this.transitionModeEnabled) {
+        await this.domainEventPublisher.publish(
+          this.domainEventFactory.createTransitionRequestedEvent({
+            userUuid,
+          }),
+        )
+      }
     }
 
     return {