diff --git a/Riot/Modules/DeviceVerification/DeviceVerificationCoordinator.swift b/Riot/Modules/DeviceVerification/DeviceVerificationCoordinator.swift
index d547053bf..ec77b3ba7 100644
--- a/Riot/Modules/DeviceVerification/DeviceVerificationCoordinator.swift
+++ b/Riot/Modules/DeviceVerification/DeviceVerificationCoordinator.swift
@@ -132,7 +132,6 @@ final class DeviceVerificationCoordinator: DeviceVerificationCoordinatorType {
         coordinator.delegate = self
         coordinator.start()
 
-        // TODO: Do not push, replace
         self.add(childCoordinator: coordinator)
         self.navigationRouter.push(coordinator, animated: animated) { [weak self] in
             self?.remove(childCoordinator: coordinator)
@@ -152,8 +151,6 @@ extension DeviceVerificationCoordinator: DeviceVerificationStartCoordinatorDeleg
     }
 
     func deviceVerificationStartCoordinator(_ coordinator: DeviceVerificationStartCoordinatorType, didTransactionCancelled transaction: MXSASTransaction) {
-
-        // TODO
         self.delegate?.deviceVerificationCoordinatorDidComplete(self)
     }
 
diff --git a/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.swift b/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.swift
index 23af7ab06..b9ebde0b5 100644
--- a/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.swift
+++ b/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.swift
@@ -66,6 +66,13 @@ final class DeviceVerificationVerifiedViewController: UIViewController {
         self.registerThemeServiceDidChangeThemeNotification()
         self.update(theme: self.theme)
     }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
+        // Hide back button
+        self.navigationItem.setHidesBackButton(true, animated: animated)
+    }
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return self.theme.statusBarStyle
diff --git a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
index a9436dd80..b15eef975 100644
--- a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
+++ b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
@@ -80,6 +80,9 @@ final class DeviceVerificationVerifyViewController: UIViewController {
         super.viewWillAppear(animated)
         
         self.keyboardAvoider?.startAvoiding()
+
+        // Hide back button
+        self.navigationItem.setHidesBackButton(true, animated: animated)
     }
 
     override func viewDidAppear(_ animated: Bool) {