diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java
index 1c3c79a7447..5ba0e006db9 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorExecutor.java
@@ -139,6 +139,10 @@ public class PercolatorExecutor extends AbstractIndexComponent {
     }
 
     public void addQuery(String name, byte[] source, int sourceOffset, int sourceLength) throws ElasticSearchException {
+        addQuery(name, parseQuery(name, source, sourceOffset, sourceLength));
+    }
+
+    public Query parseQuery(String name, byte[] source, int sourceOffset, int sourceLength) throws ElasticSearchException {
         XContentParser parser = null;
         try {
             parser = XContentFactory.xContent(source, sourceOffset, sourceLength).createParser(source, sourceOffset, sourceLength);
@@ -155,7 +159,7 @@ public class PercolatorExecutor extends AbstractIndexComponent {
                     }
                 }
             }
-            addQuery(name, query);
+            return query;
         } catch (IOException e) {
             throw new ElasticSearchException("Failed to add query [" + name + "]", e);
         } finally {
@@ -173,6 +177,10 @@ public class PercolatorExecutor extends AbstractIndexComponent {
         this.queries = MapBuilder.newMapBuilder(queries).remove(name).immutableMap();
     }
 
+    public synchronized void addQueries(Map<String, Query> queries) {
+        this.queries = MapBuilder.newMapBuilder(this.queries).putAll(queries).immutableMap();
+    }
+
     public Response percolate(final Request request) throws ElasticSearchException {
         return percolate(request, null, null);
     }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java
index c6d665e6c3b..8fb0e04fb56 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java
@@ -23,6 +23,7 @@ import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.*;
+import org.elasticsearch.common.collect.Maps;
 import org.elasticsearch.common.lucene.search.TermFilter;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.AbstractIndexComponent;
@@ -44,6 +45,7 @@ import org.elasticsearch.indices.IndicesService;
 
 import javax.inject.Inject;
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * @author kimchy (shay.banon)
@@ -95,7 +97,9 @@ public class PercolatorService extends AbstractIndexComponent {
             // create a query to fetch all queries that are registered under the index name (which is the type
             // in the percolator).
             Query query = new DeletionAwareConstantScoreQuery(indexQueriesFilter(indexName));
-            searcher.searcher().search(query, new QueriesLoaderCollector());
+            QueriesLoaderCollector queries = new QueriesLoaderCollector();
+            searcher.searcher().search(query, queries);
+            percolator.addQueries(queries.queries());
         } catch (IOException e) {
             throw new PercolatorException(index, "failed to load queries from percolator index");
         } finally {
@@ -131,6 +135,12 @@ public class PercolatorService extends AbstractIndexComponent {
 
         private IndexReader reader;
 
+        private Map<String, Query> queries = Maps.newHashMap();
+
+        public Map<String, Query> queries() {
+            return this.queries;
+        }
+
         @Override public void setScorer(Scorer scorer) throws IOException {
         }
 
@@ -140,7 +150,7 @@ public class PercolatorService extends AbstractIndexComponent {
             Document document = reader.document(doc, SourceFieldSelector.INSTANCE);
             byte[] source = document.getBinaryValue(SourceFieldMapper.NAME);
             try {
-                percolator.addQuery(id, source, 0, source.length);
+                queries.put(id, percolator.parseQuery(id, source, 0, source.length));
             } catch (Exception e) {
                 logger.warn("failed to add query [{}]", e, id);
             }