diff --git a/data/protobuf/build.gradle.kts b/data/protobuf/build.gradle.kts
index 541285a262bf..9c7eea0ccfb6 100644
--- a/data/protobuf/build.gradle.kts
+++ b/data/protobuf/build.gradle.kts
@@ -33,6 +33,7 @@ kaliumLibrary {
 val codegenProject = project(":tools:protobuf-codegen")
 val generatedFilesBaseDir = file("generated")
 generatedFilesBaseDir.mkdirs()
+val generatedFileSuppressions = """@file:Suppress("UNNECESSARY_NOT_NULL_ASSERTION")"""
 
 kotlin {
     sourceSets {
@@ -97,6 +98,16 @@ codegenProject.tasks
                     "Failed to move Generated protobuf files from '${generatedDirectory.absolutePath}' " +
                             "to destination directory '${targetDirectory.absolutePath}'"
                 }
+
+                targetDirectory
+                    .walkTopDown()
+                    .filter { it.isFile && it.extension == "kt" }
+                    .forEach { generatedFile ->
+                        val content = generatedFile.readText()
+                        if (!content.contains(generatedFileSuppressions)) {
+                            generatedFile.writeText("$generatedFileSuppressions\n$content")
+                        }
+                    }
             }
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5cb86a7082c1..34f7d1554ef7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -33,7 +33,7 @@ multiplatform-settings = "1.3.0"
 moduleGraph = "0.13.0"
 sqldelight = "0.0.6-2.3.2"
 sqlcipher-android = "4.13.0"
-pbandk = "0.15.0"
+pbandk = "0.16.0"
 turbine = "1.1.0"
 avs = "10.3.23"
 jna = "5.17.0"