diff --git a/server/src/main/java/io/druid/curator/CuratorConfig.java b/server/src/main/java/io/druid/curator/CuratorConfig.java
index 7ac0247b342..50d23f64104 100644
--- a/server/src/main/java/io/druid/curator/CuratorConfig.java
+++ b/server/src/main/java/io/druid/curator/CuratorConfig.java
@@ -34,6 +34,6 @@ public abstract class CuratorConfig
   public abstract int getZkSessionTimeoutMs();
 
   @Config("druid.curator.compress")
-  @Default("false")
+  @Default("true")
   public abstract boolean enableCompression();
 }
diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java b/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java
index eeed92b045a..eb52deb13bd 100644
--- a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java
+++ b/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java
@@ -25,7 +25,7 @@ import com.google.inject.Provider;
 
 /**
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = LegacyDataSegmentAnnouncerProvider.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = BatchDataSegmentAnnouncerProvider.class)
 @JsonSubTypes(value = {
     @JsonSubTypes.Type(name = "legacy", value = LegacyDataSegmentAnnouncerProvider.class),
     @JsonSubTypes.Type(name = "batch", value = BatchDataSegmentAnnouncerProvider.class)