diff --git a/gradle.properties b/gradle.properties
index c217edb035c..6c9704f1421 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,6 +8,9 @@ android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
 
+# https://github.com/google/ksp/issues/2491
+ksp.useKSP2=false
+
 # JS NPM
 
 crypto_js_version=4.1.1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 28a46778036..6461f4f4eaa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ koin = "4.1.0"
 okio = "3.15.0"
 
 ksp = "2.2.0-2.0.2"
-kotlin-poet = "1.18.1"
+kotlin-poet = "2.2.0"
 
 versions = "0.51.0"
 nmcp = "1.0.1"