diff --git a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
index 97b6eb6209..06abc16cbf 100644
--- a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
+++ b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
@@ -137,7 +137,7 @@ class SpaceStateHandlerImpl @Inject constructor(
 
     override fun popSpaceBackstack(): String? {
         vectorPreferences.getSpaceBackstack().toMutableList().apply {
-            val poppedSpaceId = removeLast()
+            val poppedSpaceId = removeAt(lastIndex)
             vectorPreferences.setSpaceBackstack(this)
             return poppedSpaceId
         }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt
index 5187b8ba73..6efe59b09a 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/views/LockScreenCodeView.kt
@@ -92,7 +92,7 @@ class LockScreenCodeView @JvmOverloads constructor(
      */
     fun deleteLast(): Int {
         if (code.size == 0) return code.size
-        code.removeLast()
+        code.removeAt(code.lastIndex)
         getCodeView(code.size)?.toggle()
         return code.size
     }