diff --git a/scd/app-piv.c b/scd/app-piv.c
index a51ac31ec..b7dbbad8b 100644
--- a/scd/app-piv.c
+++ b/scd/app-piv.c
@@ -3012,11 +3012,11 @@ do_writekey (app_t app, ctrl_t ctrl,
   (void)pincb;
   (void)pincb_arg;

-  if (!app->app_local->flags.yubikey)
-    {
-      err = gpg_error (GPG_ERR_NOT_SUPPORTED);
-      goto leave;
-    }
+  //if (!app->app_local->flags.yubikey)
+  //  {
+  //    err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+  //    goto leave;
+  //  }

   /* Check keyref and test whether a key already exists.  */
   dobj = find_dobj_by_keyref (app, keyrefstr);