diff --git a/roles/pfsense_upgrade/tasks/main.yml b/roles/pfsense_upgrade/tasks/main.yml
index 52ac2ed..6a5298a 100644
--- a/roles/pfsense_upgrade/tasks/main.yml
+++ b/roles/pfsense_upgrade/tasks/main.yml
@@ -21,7 +21,10 @@
 - name: Include upgrade execution
   ansible.builtin.import_tasks: upgrade.yml
   tags: [upgrade]
-  when: perform_upgrade | bool
+  when: 
+    - perform_upgrade | bool
+    - upgrade_available | bool
+
 
 - name: Include CARP/HA post-upgrade restore
   ansible.builtin.import_tasks: carp.yml