diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java
index d8f514fae..2eeef8bca 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java
@@ -165,8 +165,14 @@ class ManageSecurityTokenPresenter implements ManageSecurityTokenMvpPresenter {
     private void performKeyCheck() {
         boolean keyIsEmpty = tokenInfo.isEmpty();
         if (keyIsEmpty) {
-            view.statusLineOk();
+            boolean tokenIsAdminLocked = tokenInfo.getVerifyAdminRetries() == 0;
+            if (tokenIsAdminLocked) {
+                view.statusLineError();
+                view.showActionLocked(0);
+                return;
+            }
 
+            view.statusLineOk();
             view.showActionEmptyToken();
             return;
         }