diff --git a/server.js b/server.js
index 20f620c3131ba0c856359801450639915dfa2e63..8c9bff5822ac36d9ede15826460c8cc2bd9c4181 100644
--- a/server.js
+++ b/server.js
@@ -110,6 +110,11 @@ function Server (home, memoryOnly, overrideConf) {
         that.conf[key] = defaultValues[key];
       }
     });
+    // Default keypair
+    if (!that.conf.pair || !that.conf.pair.pub || !that.conf.pair.sec) {
+      // Create a random key
+      that.conf.pair = keyring.randomKey().json()
+    }
     // Extract key pair
     that.keyPair = keyring.Key(that.conf.pair.pub, that.conf.pair.sec);
     that.sign = that.keyPair.sign;