diff --git a/tasks/nova_disable_smt.yml b/tasks/nova_disable_smt.yml
index d5cfd758..6ff78843 100644
--- a/tasks/nova_disable_smt.yml
+++ b/tasks/nova_disable_smt.yml
@@ -15,6 +15,7 @@
 
 - name: Disable SMT
   command: /usr/sbin/ppc64_cpu --smt=off
+  register: smt_disable_result
   changed_when: false
   failed_when: false
   tags:
@@ -29,6 +30,8 @@
     group: "root"
   when:
     - ansible_service_mgr == 'systemd'
+    - smt_disable_result.rc is defined
+    - smt_disable_result.rc == 0
   notify:
     - Reload systemd daemon
 
@@ -38,5 +41,7 @@
     dest: "/etc/init/smt.conf"
   when:
     - ansible_service_mgr != 'systemd'
+    - smt_disable_result.rc is defined
+    - smt_disable_result.rc == 0
   notify:
     - Reload upstart init scripts