diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt
index 87a420d3..41c08e68 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 
 
 class SasVerificationViewModel @Inject constructor() : ViewModel(),
-                                                       SasVerificationService.SasVerificationListener {
+        SasVerificationService.SasVerificationListener {
 
 
     companion object {
@@ -40,7 +40,7 @@ class SasVerificationViewModel @Inject constructor() : ViewModel(),
         const val NAVIGATE_CANCELLED = "NAVIGATE_CANCELLED"
     }
 
-    lateinit var sasVerificationService: SasVerificationService
+    private lateinit var sasVerificationService: SasVerificationService
 
     var otherUserId: String? = null
     var otherDeviceId: String? = null
@@ -154,8 +154,8 @@ class SasVerificationViewModel @Inject constructor() : ViewModel(),
 
     override fun onCleared() {
         super.onCleared()
-        sasVerificationService.removeListener(this)
+        if (::sasVerificationService.isInitialized) {
+            sasVerificationService.removeListener(this)
+        }
     }
-
-
 }
\ No newline at end of file