diff --git a/internal/pkg/etcd/etcd.go b/internal/pkg/etcd/etcd.go
index 4589de5903..43dc079b39 100644
--- a/internal/pkg/etcd/etcd.go
+++ b/internal/pkg/etcd/etcd.go
@@ -171,6 +171,11 @@ func (c *Client) LeaveCluster(ctx context.Context, st state.State) error {
 			return retry.ExpectedError(err)
 		}
 
+		if errors.Is(err, rpctypes.ErrMemberNotFound) {
+			// already removed, nothing to do
+			return nil
+		}
+
 		return err
 	}); err != nil {
 		return err