diff --git a/core/environment/manager.go b/core/environment/manager.go
index 0f239b73..5379d874 100644
--- a/core/environment/manager.go
+++ b/core/environment/manager.go
@@ -997,8 +997,8 @@ func (envs *Manager) handleIntegratedServiceEvent(evt event.IntegratedServiceEve
 									WithField("partition", envId.String()).
 									WithError(err).
 									Error("environment GO_ERROR transition failed after ODC_PARTITION_STATE_CHANGE ERROR event")
+								env.setState("ERROR")
 							}
-							env.setState("ERROR")
 						}
 					}()
 				}