diff --git a/app/src/main/kotlin/com/vanniktech/emoji/sample/EmojisActivity.kt b/app/src/main/kotlin/com/vanniktech/emoji/sample/EmojisActivity.kt
index af4e9eeec5..07c22e6600 100644
--- a/app/src/main/kotlin/com/vanniktech/emoji/sample/EmojisActivity.kt
+++ b/app/src/main/kotlin/com/vanniktech/emoji/sample/EmojisActivity.kt
@@ -62,7 +62,7 @@ class EmojisActivity :
   }
 
   override fun onEmojiBackspaceClick() {
-    binding.selectedEmoji.text = ""
+    binding.selectedEmoji.text = null
   }
 
   override fun onEmojiClick(emoji: Emoji) {
diff --git a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt
index f66332be9b..34cdb75135 100644
--- a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt
+++ b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt
@@ -73,7 +73,7 @@ class MainDialog : DialogFragment() {
       val text = editText.text.toString().trim { it <= ' ' }
       if (text.isNotEmpty()) {
         chatAdapter.add(text)
-        editText.setText("")
+        editText.setText(null)
       }
     }
     val recyclerView: RecyclerView = result.findViewById(R.id.main_dialog_recycler_view)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c278e37a31..1672e9ab3d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ minSdk = "21"
 compileSdk = "34"
 targetSdk = "34"
 
-androidgradleplugin = "8.4.2"
+androidgradleplugin = "8.5.0"
 kotlin = "2.0.0"
 ktlint = "1.2.1"