diff --git a/build.gradle.kts b/build.gradle.kts
index ff96d58c64..c6039cd80a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
     id("com.diffplug.spotless")
     id("com.gradleup.shadow") apply false
@@ -27,4 +29,13 @@ subprojects {
             googleJavaFormat()
         }
     }
+
+    pluginManager.withPlugin("com.gradleup.shadow") {
+        tasks.withType<ShadowJar>().configureEach {
+            // avoid warning about duplicate kotlin module files being silently dropped
+            filesMatching("META-INF/*.kotlin_module") {
+                duplicatesStrategy = DuplicatesStrategy.INCLUDE
+            }
+        }
+    }
 }
diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts
index 774d482576..0e75f11f76 100644
--- a/grpc/build.gradle.kts
+++ b/grpc/build.gradle.kts
@@ -58,4 +58,8 @@ protobuf {
 
 tasks.shadowJar {
     mergeServiceFiles()
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    filesMatching("META-INF/services/**") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
 }