diff --git a/pkg/harvester/components/vm-migration/ReviewMigrationStep.vue b/pkg/harvester/components/vm-migration/ReviewMigrationStep.vue
index 7743dc25..8255fd5f 100644
--- a/pkg/harvester/components/vm-migration/ReviewMigrationStep.vue
+++ b/pkg/harvester/components/vm-migration/ReviewMigrationStep.vue
@@ -382,9 +382,9 @@ defineExpose({ startMigration: startMigrationAction });
           </template>
           <template #header-right>
             <a
-              role="button"
+              href="#"
               class="edit-selection-link"
-              @click="onEditSelection"
+              @click.prevent="onEditSelection"
             >
               {{ t('harvester.addons.vmMigration.reviewMigration.editSelection') }}
             </a>
@@ -458,6 +458,21 @@ defineExpose({ startMigration: startMigrationAction });
               </template>
             </rc-dropdown>
           </template>
+          <template #no-rows>
+            <tr class="no-rows">
+              <td
+                :colspan="vmHeaders.length"
+                class="text-center"
+              >
+                {{ t('harvester.addons.vmMigration.reviewMigration.noVmSelected') }}
+                <a
+                  href="#"
+                  class="edit-selection-link"
+                  @click.prevent="onEditSelection"
+                >{{ t('harvester.addons.vmMigration.reviewMigration.noVmSelectedLink') }}</a>
+              </td>
+            </tr>
+          </template>
         </SortableTable>
       </div>
 
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index 24bd197d..fc6fc06f 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -2000,6 +2000,8 @@ harvester:
         coldMigrationHint: Plan a maintenance window and notify relevant stakeholders before starting.
         virtualMachines: Virtual Machines
         editSelection: Edit selection
+        noVmSelected: "No VMs selected. Return to "
+        noVmSelectedLink: "Step 2 to select virtual machines."
         columns:
           vmName: VM Name
           os: Operating System
diff --git a/pkg/harvester/pages/c/_cluster/vm-migration/vm-migration-wizard.vue b/pkg/harvester/pages/c/_cluster/vm-migration/vm-migration-wizard.vue
index c2023f56..0a5c9f3a 100644
--- a/pkg/harvester/pages/c/_cluster/vm-migration/vm-migration-wizard.vue
+++ b/pkg/harvester/pages/c/_cluster/vm-migration/vm-migration-wizard.vue
@@ -184,6 +184,11 @@ const onEditMappings = () => {
 const onRemoveVm = (id) => {
   selectedVMs.value = selectedVMs.value.filter((vm) => vm.id !== id);
   stepData.vms.selectedVMIds.delete(id);
+
+  vmsReady.value = selectedVMs.value.length > 0;
+  if (!vmsReady.value) {
+    reviewReady.value = false;
+  }
 };
 
 // Clear downstream data when provider changes