diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift
index 9422c753a..9ace93dd1 100644
--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -436,6 +436,7 @@ class BWIBuildSettings: NSObject {
     // MARK: - Cross-signing  (bwi=true)
     var disableSelfUserVerification = false
     var additionalSelfVerfificationAlert = false
+    var showNoOtherDeviceError = false
     
     // MARK: - Antivirus scan  (bwi=true)
     
diff --git a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift
index c15e61342..b68a8ef89 100644
--- a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift
+++ b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift
@@ -214,7 +214,10 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController {
     
     private func render(error: Error) {
         self.activityPresenter.removeCurrentActivityIndicator(animated: true)
-        self.errorPresenter.presentError(from: self, forError: error, animated: true, handler: nil)
+        // bwi: don't show unneccessary error alert when user only has one device -> he is able to use passphrase
+        if BWIBuildSettings.shared.showNoOtherDeviceError {
+            self.errorPresenter.presentError(from: self, forError: error, animated: true, handler: nil)
+        }
     }
     
     // MARK: - Actions