diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java
index 36c45334e7edd..7813100485a71 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java
@@ -168,7 +168,7 @@ private void putTemplate(final IndexTemplateConfig config, final AtomicBoolean c
                 new ActionListener<AcknowledgedResponse>() {
                     @Override
                     public void onResponse(AcknowledgedResponse response) {
-                        creationCheck.set(false);
+                        creationCheck.set(true);
                         if (response.isAcknowledged() == false) {
                             logger.error("error adding index template [{}] for [{}], request was not acknowledged",
                                 templateName, getOrigin());
@@ -222,7 +222,7 @@ private void putPolicy(final LifecyclePolicy policy, final AtomicBoolean creatio
                 new ActionListener<PutLifecycleAction.Response>() {
                     @Override
                     public void onResponse(PutLifecycleAction.Response response) {
-                        creationCheck.set(false);
+                        creationCheck.set(true);
                         if (response.isAcknowledged() == false) {
                             logger.error("error adding lifecycle policy [{}] for [{}], request was not acknowledged",
                                 policy.getName(), getOrigin());