diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go
index 59c56e86be..da3b1a29f9 100644
--- a/pkg/api/helpers.go
+++ b/pkg/api/helpers.go
@@ -389,13 +389,13 @@ func WaitForServerState(api *ScalewayAPI, serverID string, targetState string) (
 
 	for {
 		server, err = api.GetServer(serverID)
+		if err != nil {
+			return nil, err
+		}
 		if currentState != server.State {
 			log.Infof("Server changed state to '%s'", server.State)
 			currentState = server.State
 		}
-		if err != nil {
-			return nil, err
-		}
 		if server.State == targetState {
 			break
 		}