diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt
index ffdb4e67ff..77e190b64d 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt
@@ -73,13 +73,14 @@ class DefaultLockScreenService(
     }
 
     /**
-     * Makes sure to delete the pin code when the session is deleted.
+     * Makes sure to delete the pin code when the last session is deleted.
      */
     private fun observeSessionsState() {
         sessionObserver.addListener(object : SessionListener {
             override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
-                // TODO handle multi session at some point
-                pinCodeManager.deletePinCode()
+                if (wasLastSession) {
+                    pinCodeManager.deletePinCode()
+                }
             }
         })
     }