diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 7fc903b9a..8a1d30d5b 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2361,10 +2361,15 @@ verify_chv2 (app_t app,
   if (app->did_chv2)
     return 0;  /* We already verified CHV2.  */
 
-  rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen);
-  if (rc)
-    return rc;
-  app->did_chv2 = 1;
+  if (app->app_local->pk[1].key || app->app_local->pk[2].key)
+    {
+      rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen);
+      if (rc)
+        return rc;
+      app->did_chv2 = 1;
+    }
+  else
+    rc = 0;
 
   if (!app->did_chv1 && !app->force_chv1 && pinvalue)
     {