diff --git a/internal/state/state.go b/internal/state/state.go
index 61ae87c7..1f7ff268 100644
--- a/internal/state/state.go
+++ b/internal/state/state.go
@@ -249,6 +249,11 @@ func (s *InternalState) CheckMembershipConsistency(ctx context.Context) error {
 	}
 
 	for {
+		ctxErr := ctx.Err()
+		if ctxErr != nil {
+			return fmt.Errorf("Membership consistency check failed: %w", ctxErr)
+		}
+
 		coreClusterMembers, truststoreRemotes, dqliteNodes, err := s.getMembershipData(ctx)
 		if err != nil {
 			return fmt.Errorf("Failed to gather membership data for consistency check: %w", err)
@@ -258,7 +263,7 @@ func (s *InternalState) CheckMembershipConsistency(ctx context.Context) error {
 		if err != nil {
 			select {
 			case <-ctx.Done():
-				return fmt.Errorf("Membership consistency check failed after timeout: %w", err)
+				return fmt.Errorf("Membership consistency check failed: %w", err)
 			case <-time.After(200 * time.Millisecond):
 				continue
 			}