diff --git a/api/baremetal/v1alpha1/server_utils.go b/api/baremetal/v1alpha1/server_utils.go
index d73841e80..af8008225 100644
--- a/api/baremetal/v1alpha1/server_utils.go
+++ b/api/baremetal/v1alpha1/server_utils.go
@@ -20,10 +20,12 @@ type WaitForServerRequest struct {
 func (s *API) WaitForServer(req *WaitForServerRequest) (*Server, scw.SdkError) {
 
 	terminalStatus := map[ServerStatus]struct{}{
-		ServerStatusReady:   {},
-		ServerStatusStopped: {},
-		ServerStatusError:   {},
-		ServerStatusUnknown: {},
+		ServerStatusReady:       {},
+		ServerStatusStopped:     {},
+		ServerStatusError:       {},
+		ServerStatusUndelivered: {},
+		ServerStatusLocked:      {},
+		ServerStatusUnknown:     {},
 	}
 
 	installTerminalStatus := map[ServerInstallStatus]struct{}{