diff --git a/docs/content/Configuration.md b/docs/content/Configuration.md
index 9aae64dcf51..91beca02f25 100644
--- a/docs/content/Configuration.md
+++ b/docs/content/Configuration.md
@@ -82,7 +82,7 @@ Data segment announcers are used to announce segments.
 
 |Property|Description|Default|
 |--------|-----------|-------|
-|`druid.announcer.type`|Choices: legacy or batch. The type of data segment announcer to use.|legacy|
+|`druid.announcer.type`|Choices: legacy or batch. The type of data segment announcer to use.|batch|
 
 ##### Single Data Segment Announcer
 
diff --git a/server/src/main/java/io/druid/client/FilteredServerViewProvider.java b/server/src/main/java/io/druid/client/FilteredServerViewProvider.java
index f9b20106ba2..4570c7e48cb 100644
--- a/server/src/main/java/io/druid/client/FilteredServerViewProvider.java
+++ b/server/src/main/java/io/druid/client/FilteredServerViewProvider.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.google.inject.Provider;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = SingleServerInventoryProvider.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = FilteredBatchServerViewProvider.class)
 @JsonSubTypes(value = {
     @JsonSubTypes.Type(name = "legacy", value = FilteredSingleServerViewProvider.class),
     @JsonSubTypes.Type(name = "batch", value = FilteredBatchServerViewProvider.class)
diff --git a/server/src/main/java/io/druid/client/ServerInventoryViewProvider.java b/server/src/main/java/io/druid/client/ServerInventoryViewProvider.java
index fa48fba4661..f506d03148a 100644
--- a/server/src/main/java/io/druid/client/ServerInventoryViewProvider.java
+++ b/server/src/main/java/io/druid/client/ServerInventoryViewProvider.java
@@ -25,7 +25,7 @@ import com.google.inject.Provider;
 
 /**
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = SingleServerInventoryProvider.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = BatchServerInventoryViewProvider.class)
 @JsonSubTypes(value = {
     @JsonSubTypes.Type(name = "legacy", value = SingleServerInventoryProvider.class),
     @JsonSubTypes.Type(name = "batch", value = BatchServerInventoryViewProvider.class)