diff --git a/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift b/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
index 73b523490..276f866c6 100644
--- a/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
+++ b/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
@@ -127,12 +127,17 @@ final class KeyVerificationCoordinator: KeyVerificationCoordinatorType {
         case .verifyUser(let roomMember):
             rootCoordinator = self.createUserVerificationStartCoordinator(with: roomMember)
         case .verifyDevice(let userId, let deviceId):
-            // Tchap: self verification is not supported yet
-//            if userId ==  self.session.myUser.userId {
-//                rootCoordinator = self.createSelfVerificationCoordinator(otherDeviceId: deviceId)
-//            } else {
+            // Tchap: activate self verification only if cross-signing is activated
+#if CROSS_SIGNING
+            if userId ==  self.session.myUser.userId {
+                rootCoordinator = self.createSelfVerificationCoordinator(otherDeviceId: deviceId)
+            } else {
                 rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: userId, otherDeviceId: deviceId)
-//            }
+            }
+#else
+            rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: userId, otherDeviceId: deviceId)
+#endif
+            
         case .incomingRequest(let incomingKeyVerificationRequest):
             rootCoordinator = self.createDataLoadingScreenCoordinator(with: incomingKeyVerificationRequest)
         case .incomingSASTransaction(let incomingSASTransaction):
diff --git a/changelog.d/698.change b/changelog.d/698.change
new file mode 100644
index 000000000..6be4058c1
--- /dev/null
+++ b/changelog.d/698.change
@@ -0,0 +1 @@
+Adopt SelfVerification path from Element if cross-signing is activated