diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml
index de787c122d..d970cc5b04 100644
--- a/docker/services/sensu-client.yaml
+++ b/docker/services/sensu-client.yaml
@@ -169,3 +169,23 @@ outputs:
             - step|int == 2
             - sensu_enabled.rc == 0
           service: name=sensu-client state=stopped enabled=no
+      fast_forward_upgrade_tasks:
+        - name: Check if sensu client is  deployed
+          command: systemctl is-enabled --quiet sensu-client
+          ignore_errors: True
+          register: sensu_enabled_result
+          when:
+           - step|int == 0
+           - release == 'ocata'
+        - name: Set fact sensu_enabled
+          set_fact:
+            sensu_enabled: "{{ sensu_enabled_result.rc == 0 }}"
+          when:
+           - step|int == 0
+           - release == 'ocata'
+        - name: Stop and disable sensu-client service
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - sensu_enabled|bool
+          service: name=sensu-client state=stopped enabled=no