diff --git a/sdks/java/bom/gcp/build.gradle b/sdks/java/bom/gcp/build.gradle
index b9c16ac72bb0..5b62243c8454 100644
--- a/sdks/java/bom/gcp/build.gradle
+++ b/sdks/java/bom/gcp/build.gradle
@@ -20,7 +20,17 @@ apply from: '../common.gradle'
 
 dependencies {
   api platform(project(":sdks:java:bom"))
-  api platform(project.library.java.google_cloud_platform_libraries_bom)
+  api platform(project.library.java.google_cloud_spanner_bom)
+  api platform(project.library.java.google_cloud_platform_libraries_bom) {
+    // TODO(https://github.com/apache/beam/issues/37328) remove exclude and google_cloud_spanner_bom after upstream and/or tests fixed
+    exclude group: "com.google.cloud", module: "google-cloud-spanner"
+    exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-v1"
+    exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-instance-v1"
+    exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-database-v1"
+    exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-v1"
+    exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-instance-v1"
+    exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-database-v1"
+  }
   constraints {
     api project.library.java.guava
   }
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java
index e060766cbd22..450710112a1b 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java
@@ -2101,9 +2101,10 @@ private static Dialect getDialect(SpannerConfig spannerConfig, PipelineOptions p
     // Allow passing the credential from pipeline options to the getDialect() call.
     SpannerConfig spannerConfigWithCredential =
         buildSpannerConfigWithCredential(spannerConfig, pipelineOptions);
-    DatabaseClient databaseClient =
-        SpannerAccessor.getOrCreate(spannerConfigWithCredential).getDatabaseClient();
-    return databaseClient.getDialect();
+    try (SpannerAccessor sa = SpannerAccessor.getOrCreate(spannerConfigWithCredential)) {
+      DatabaseClient databaseClient = sa.getDatabaseClient();
+      return databaseClient.getDialect();
+    }
   }
 
   /**