diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java
index 90bf8a193d..161df21159 100644
--- a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java
+++ b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java
@@ -121,8 +121,6 @@
 @InternalApi("For internal usage only")
 public class BigtableHBaseVeneerSettings extends BigtableHBaseSettings {
 
-  private static final String BIGTABLE_BATCH_DATA_HOST_DEFAULT = "batch-bigtable.googleapis.com";
-
   private static final ClientOperationTimeouts DEFAULT_TIMEOUTS =
       new ClientOperationTimeouts(
           /* unaryTimeouts= */ new OperationTimeouts(
@@ -477,12 +475,6 @@ private void configureConnection(
     if (hostOverride.isPresent() || portOverride.isPresent()) {
       endpointOverride =
           Optional.of(hostOverride.or(defaultHostname) + ":" + portOverride.or(defaultPort));
-    } else if (endpointKey.equals(BIGTABLE_HOST_KEY)
-        // only apply batch endpoint when the default endpoint hasnt changed (ie. when
-        // BIGTABLE_EMULATOR_HOST is set)
-        && defaultEndpoint.equals("bigtable.googleapis.com:443")
-        && configuration.getBoolean(BIGTABLE_USE_BATCH, false)) {
-      endpointOverride = Optional.of(BIGTABLE_BATCH_DATA_HOST_DEFAULT + ":443");
     }
 
     if (endpointOverride.isPresent()) {
diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java
index 0477942a6c..bf40c2d62d 100644
--- a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java
+++ b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java
@@ -230,7 +230,6 @@ public Configuration toHBaseConfig() {
 
     /**
      * Sets below setting for batch BIGTABLE_USE_CACHED_DATA_CHANNEL_POOL = true
-     * BigtableOptionsFactory.BIGTABLE_HOST_KEY = batch-bigtable.googleapis.com
      * BigtableOptionsFactory.INITIAL_ELAPSED_BACKOFF_MILLIS_KEY = 5ms
      * BigtableOptionsFactory.MAX_ELAPSED_BACKOFF_MILLIS_KEY = 5ms
      */