diff --git a/roles/pfsense_upgrade/tasks/upgrade.yml b/roles/pfsense_upgrade/tasks/upgrade.yml
index a3eed02..bd5e0cc 100644
--- a/roles/pfsense_upgrade/tasks/upgrade.yml
+++ b/roles/pfsense_upgrade/tasks/upgrade.yml
@@ -84,6 +84,13 @@
     - perform_upgrade | bool
     - _verify_repo_switch.stdout | trim == upgrade_target_repo
 
+- name: Halt if repository switch failed
+  ansible.builtin.fail:
+    msg: "Repo is still {{ _verify_repo_switch.stdout | trim }}, expected {{ upgrade_target_repo }}. Stopping to prevent false positive upgrade."
+  when: 
+    - perform_upgrade | bool
+    - _verify_repo_switch.stdout | trim != upgrade_target_repo
+    
 # ---------------------------------------------------------------------------
 # 2. Execute the upgrade (with retry for lock error RC=99)
 # ---------------------------------------------------------------------------