diff --git a/contrib/ansible/roles/etcd/handlers/main.yml b/contrib/ansible/roles/etcd/handlers/main.yml
index 9218108772c..11ec38485fb 100644
--- a/contrib/ansible/roles/etcd/handlers/main.yml
+++ b/contrib/ansible/roles/etcd/handlers/main.yml
@@ -1,6 +1,7 @@
 ---
 - name: restart etcd
   service: name=etcd state=restarted
+  when: etcd_started.changed == false
 
 - name: Save iptables rules
   command: service iptables save
diff --git a/contrib/ansible/roles/etcd/tasks/main.yml b/contrib/ansible/roles/etcd/tasks/main.yml
index 67ff4d42c94..527bfd6abc0 100644
--- a/contrib/ansible/roles/etcd/tasks/main.yml
+++ b/contrib/ansible/roles/etcd/tasks/main.yml
@@ -14,7 +14,11 @@
         - restart etcd
 
 - name: Enable etcd
-  service: name=etcd enabled=yes state=started
+  service: name=etcd enabled=yes
+
+- name: Start etcd
+  service: name=etcd state=started
+  register: etcd_started
 
 - include: firewalld.yml
   when: has_firewalld