diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
index 81e4a36a3584..bc0efd837755 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -130,7 +130,7 @@ protected String defaultHost() {
     String host = System.getProperty(
         com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR,
         System.getenv(com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR));
-    return host != null ? host : super.defaultHost();
+    return host != null ? host : com.google.datastore.v1beta3.client.DatastoreFactory.DEFAULT_HOST;
   }
 
   @Override
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DefaultDatastoreRpc.java
index 421ba95161f2..1fb0fa3a26c6 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DefaultDatastoreRpc.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DefaultDatastoreRpc.java
@@ -54,8 +54,9 @@ public DefaultDatastoreRpc(DatastoreOptions options) {
       if (fullURL.charAt(fullURL.length() - 1) != '/') {
         fullURL = fullURL + '/';
       }
-      fullURL = fullURL + "datastore/"
-          + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION + "/projects/"
+      fullURL = fullURL
+          + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION
+          + "/projects/"
           + options.projectId();
       clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullURL);
     }