diff --git a/tasks/rabbitmq_upgrade_check.yml b/tasks/rabbitmq_upgrade_check.yml
index 7e72a738..719809e6 100644
--- a/tasks/rabbitmq_upgrade_check.yml
+++ b/tasks/rabbitmq_upgrade_check.yml
@@ -70,4 +70,7 @@
 
 - include: rabbitmq_upgrade_prep.yml
   static: no
-  when: rabbitmq_upgrade | bool
+  when:
+    - rabbitmq_upgrade | bool
+    - installed_rabbitmq.rc == 0
+    - not installed_rabbitmq.stdout | search(rabbitmq_package_version)