diff --git a/deployment/snmp/snmp-baremetal-puppet.yaml b/deployment/snmp/snmp-baremetal-puppet.yaml
index e3802eaaba..6e8965953d 100644
--- a/deployment/snmp/snmp-baremetal-puppet.yaml
+++ b/deployment/snmp/snmp-baremetal-puppet.yaml
@@ -89,6 +89,17 @@ outputs:
       step_config: |
         include ::tripleo::profile::base::snmp
       upgrade_tasks:
+        - when: step|int == 0
+          block:
+            - name: Check if snmpd is enabled
+              command: systemctl is-enabled --quiet snmpd
+              ignore_errors: True
+              register: snmpd_enabled_result
+            - name: Set fact snmpd_enabled
+              set_fact:
+                snmpd_enabled: "{{ snmpd_enabled_result.rc == 0 }}"
         - name: Stop snmp service
-          when: step|int == 1
+          when:
+            - step|int == 1
+            - snmpd_enabled|bool
           service: name=snmpd state=stopped