diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml
index becba23f9b..fcead66c9d 100644
--- a/deployment/iscsid/iscsid-container-puppet.yaml
+++ b/deployment/iscsid/iscsid-container-puppet.yaml
@@ -111,6 +111,13 @@ outputs:
         - name: Stop and disable iscsid.socket service
           service: name=iscsid.socket state=stopped enabled=no
           when: stat_iscsid_socket.stat.exists
+        - name: Check if iscsi.service is enabled
+          command: systemctl is-enabled --quiet iscsi.service
+          ignore_errors: True
+          register: iscsi_service_enabled_result
+        - name: Stop iscsi.service
+          service: name=iscsi.service state=stopped enabled=no
+          when: iscsi_service_enabled_result.rc == 0
       upgrade_tasks: []
       post_upgrade_tasks:
         - when: step|int == 1