diff --git a/datastore/datastore.go b/datastore/datastore.go
index e156b4a77e48..52680ea275f5 100644
--- a/datastore/datastore.go
+++ b/datastore/datastore.go
@@ -105,9 +105,7 @@ func NewClientWithDatabase(ctx context.Context, projectID, databaseID string, op
 	// If the emulator is available, dial it without passing any credentials.
 	if addr := os.Getenv("DATASTORE_EMULATOR_HOST"); addr != "" {
 		o = []option.ClientOption{
-			internaloption.WithDefaultEndpointTemplate(prodEndpointTemplate),
-			internaloption.WithDefaultUniverseDomain(prodUniverseDomain),
-			internaloption.WithDefaultMTLSEndpoint(prodMtlsAddr),
+			option.WithEndpoint(addr),
 			option.WithoutAuthentication(),
 			option.WithGRPCDialOption(grpc.WithInsecure()),
 		}