diff --git a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt
index 9717bb4de3..277be46a37 100644
--- a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt
+++ b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt
@@ -121,7 +121,7 @@ class PassCodeManager(private val preferences: AppPreferences, private val clock
             visibleActivitiesCounter--
         }
         val powerMgr = activity.getSystemService(Context.POWER_SERVICE) as PowerManager
-        if ((isPassCodeEnabled() || deviceCredentialsAreEnabled(activity)) && !powerMgr?.isScreenOn) {
+        if ((isPassCodeEnabled() || deviceCredentialsAreEnabled(activity)) && !powerMgr.isScreenOn) {
             activity.moveTaskToBack(true)
         }
     }
diff --git a/build.gradle b/build.gradle
index 0aa550f9d2..7ea2c83daa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         jacoco_version = '0.8.8'
-        kotlin_version = '1.6.21'
+        kotlin_version = '1.7.10'
         androidxTestVersion = "1.4.0"
         daggerVersion = "2.43.2"
         markwonVersion = "4.6.2"