diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
index c121946b1..eeeaa45e0 100644
--- a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
+++ b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
@@ -39,6 +39,8 @@ import com.otaliastudios.autocomplete.AutocompleteCallback;
 import com.vanniktech.emoji.EmojiRange;
 import com.vanniktech.emoji.Emojis;
 
+import kotlin.OptIn;
+
 public class MentionAutocompleteCallback implements AutocompleteCallback<Mention> {
     private final ViewThemeUtils viewThemeUtils;
     private Context context;
@@ -55,6 +57,7 @@ public class MentionAutocompleteCallback implements AutocompleteCallback<Mention
         this.viewThemeUtils = viewThemeUtils;
     }
 
+    @OptIn(markerClass = kotlin.ExperimentalStdlibApi.class)
     @Override
     public boolean onPopupItemClicked(Editable editable, Mention item) {
         int[] range = MagicCharPolicy.getQueryRange(editable);
diff --git a/build.gradle b/build.gradle
index d563b27ad..6030bd6fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@
 buildscript {
 
     ext {
-        kotlinVersion = '1.7.10'
+        kotlinVersion = '1.7.20'
     }
 
     repositories {