diff --git a/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts
index 2bd1a1426f..4cffa816b1 100644
--- a/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts
@@ -55,7 +55,7 @@ tasks.withType<KotlinCompile>().all {
     kotlinOptions {
         jvmTarget = javaVersion.majorVersion
         apiVersion = project.kotlinTarget().get()
-        languageVersion = project.kotlinTarget().get()
+        languageVersion = "2.0"
         freeCompilerArgs = listOf("-Xjvm-default=all")
     }
 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt
index eb42f2b770..53c9ef2abe 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt
@@ -67,7 +67,8 @@ class QGettingStartedContent(val project: Project) : Disposable {
                     AmazonQToolWindow.getStarted(project)
                 }
             }
-            null
+
+            JBCefJSQuery.Response(null)
         }
         receiveMessageQuery.addHandler(handler)
     }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
index 1c00247430..c8cac9ec58 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -73,7 +73,8 @@ class BrowserConnector(
     private fun addMessageHook(browser: Browser) = callbackFlow {
         val handler = Function<String, Response> {
             trySend(it)
-            null
+
+            Response(null)
         }
 
         browser.receiveMessageQuery.addHandler(handler)
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt
index c51cc82e66..64fd0ae2b5 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt
@@ -54,7 +54,8 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                     return@onCompletion
                 } // for any other exception, let the `catch` operator handle it.
                 else if (error != null) {
-                    throw error
+                    // smartcast is failing on 2.0: Type mismatch: inferred type is '@R|kotlin/ParameterName|(name = String(cause))  kotlin/Throwable?' but 'kotlin/Throwable' was expected
+                    throw error as Throwable
                 }
 
                 // Send the gathered suggestions in a final answer-part message