diff --git a/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/exit_maintenance_step.go b/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/exit_maintenance_step.go
index 0ce2d8e8e7..510de7811e 100644
--- a/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/exit_maintenance_step.go
+++ b/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/exit_maintenance_step.go
@@ -92,6 +92,8 @@ func (s ExitMaintenanceStep) Take(ctx context.Context, vmop *v1alpha2.VirtualMac
 			)
 			return &reconcile.Result{}, err
 		}
+
+		maintenanceVMCondition.Status = metav1.ConditionFalse
 	}
 
 	// If the maintenance condition was not present on the VM,
diff --git a/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/waiting_disk_ready_step.go b/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/waiting_disk_ready_step.go
index 7d9f6c5b9c..28994d0ec5 100644
--- a/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/waiting_disk_ready_step.go
+++ b/images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/step/waiting_disk_ready_step.go
@@ -79,7 +79,7 @@ func (s WaitingDisksReadyStep) Take(ctx context.Context, vmop *v1alpha2.VirtualM
 			if k8serrors.IsNotFound(err) {
 				cb.Message("Waiting for resource readiness.")
 				conditions.SetCondition(cb, &vmop.Status.Conditions)
-				return nil, nil
+				return &reconcile.Result{}, nil
 			}
 			return &reconcile.Result{}, fmt.Errorf("failed to get the `VirtualDisk`: %w", err)
 		}