diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml
index 5d6b69a422..00d6d2433a 100644
--- a/deployment/iscsid/iscsid-container-puppet.yaml
+++ b/deployment/iscsid/iscsid-container-puppet.yaml
@@ -117,7 +117,9 @@ outputs:
           register: iscsi_service_enabled_result
         - name: Stop iscsi.service
           service: name=iscsi.service state=stopped enabled=no
-          when: iscsi_service_enabled_result.rc == 0
+          when:
+            - iscsi_service_enabled_result is changed
+            - iscsi_service_enabled_result.rc == 0
       upgrade_tasks: []
       post_upgrade_tasks:
         - when: step|int == 1