diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java b/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java
index 2b4f48ac47b0..4cf3a5af63b3 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/indices/Indices.java
@@ -121,7 +121,6 @@ public void move(String source, String target) {
             }
 
             request.setConsistencyLevel(WriteConsistencyLevel.ONE);
-            request.setReplicationType(ReplicationType.ASYNC);
 
             if (request.numberOfActions() > 0) {
                 BulkResponse response = c.bulk(request.request()).actionGet();
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/messages/Messages.java b/graylog2-server/src/main/java/org/graylog2/indexer/messages/Messages.java
index e26447e256ba..39cd5d6eac38 100644
--- a/graylog2-server/src/main/java/org/graylog2/indexer/messages/Messages.java
+++ b/graylog2-server/src/main/java/org/graylog2/indexer/messages/Messages.java
@@ -98,13 +98,12 @@ public boolean bulkIndex(final List<Message> messages) {
 
         final BulkRequestBuilder request = c.prepareBulk();
         for (Message msg : messages) {
-            request.add(buildIndexRequest(configuration.getIndexPrefix() + "_" + Deflector.DEFLECTOR_SUFFIX,
+            request.add(buildIndexRequest(Deflector.buildName(configuration.getIndexPrefix()),
                                           msg.toElasticSearchObject(),
                                           msg.getId())); // Main index.
         }
 
         request.setConsistencyLevel(WriteConsistencyLevel.ONE);
-        request.setReplicationType(ReplicationType.ASYNC);
 
         final BulkResponse response = c.bulk(request.request()).actionGet();