diff --git a/www/form/command-handler.js b/www/form/command-handler.js
index dc49a9e18..2592d11ab 100644
--- a/www/form/command-handler.js
+++ b/www/form/command-handler.js
@@ -215,8 +215,8 @@ define([
                     formData = Utils.Hash.getFormData(Utils.secret);
                     keys = Utils.secret && Utils.secret.keys;
                 }
-                privateKey = formData.form_private;
-                publicKey = formData.form_public;
+                privateKey = formData?.form_private;
+                publicKey = formData?.form_public;
                 var curvePrivate = privateKey || data.privateKey;
                 if (!curvePrivate) { return void cb({error: 'EFORBIDDEN'}); }
                 var crypto = Utils.Crypto.Mailbox.createEncryptor({