diff --git a/roles/pfsense_upgrade/tasks/main.yml b/roles/pfsense_upgrade/tasks/main.yml
index 6a5298a..0b780d5 100644
--- a/roles/pfsense_upgrade/tasks/main.yml
+++ b/roles/pfsense_upgrade/tasks/main.yml
@@ -13,11 +13,15 @@
   ansible.builtin.import_tasks: update_check.yml
   tags: [always, check]
 
+# --- CARP/HA PRE-UPGRADE LOGIC (before upgrade) ---
 - name: Include CARP/HA pre-upgrade logic
   ansible.builtin.import_tasks: carp.yml
   tags: [always, check, carp]
-  when: ha_peer is defined
+  when: 
+    - ha_peer is defined
+    - ha_peer | length > 0
 
+# --- UPGRADE EXECUTION ---
 - name: Include upgrade execution
   ansible.builtin.import_tasks: upgrade.yml
   tags: [upgrade]
@@ -25,12 +29,13 @@
     - perform_upgrade | bool
     - upgrade_available | bool
 
-
+# --- CARP/HA POST-UPGRADE RESTORE (after upgrade) ---
 - name: Include CARP/HA post-upgrade restore
   ansible.builtin.import_tasks: carp.yml
   tags: [upgrade, carp]
   when:
     - ha_peer is defined
+    - ha_peer | length > 0
     - perform_upgrade | bool
 
 - name: Include post-upgrade verification