diff --git a/Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewController.swift b/Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewController.swift
index ef1bbf239..4688ce8c4 100644
--- a/Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewController.swift
+++ b/Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewController.swift
@@ -67,11 +67,6 @@ final class EnterPinCodeViewController: UIViewController {
         self.update(theme: self.theme)
         
         self.viewModel.viewDelegate = self
-        
-        if #available(iOS 13.0, *) {
-            modalPresentationStyle = .fullScreen
-            isModalInPresentation = true
-        }
 
         self.viewModel.process(viewAction: .loadData)
     }
diff --git a/Riot/Modules/SetPinCode/SetPinCoordinator.swift b/Riot/Modules/SetPinCode/SetPinCoordinator.swift
index 5e65b81aa..901b82bbb 100644
--- a/Riot/Modules/SetPinCode/SetPinCoordinator.swift
+++ b/Riot/Modules/SetPinCode/SetPinCoordinator.swift
@@ -70,7 +70,11 @@ final class SetPinCoordinator: SetPinCoordinatorType {
     }
     
     func toPresentable() -> UIViewController {
-        return self.navigationRouter.toPresentable()
+        let controller = self.navigationRouter.toPresentable()
+        if #available(iOS 13.0, *) {
+            controller.modalPresentationStyle = .fullScreen
+        }
+        return controller
     }
     
     // MARK: - Private methods