diff --git a/src/OrbitDB.js b/src/OrbitDB.js
index 1d7537e..9f617e2 100644
--- a/src/OrbitDB.js
+++ b/src/OrbitDB.js
@@ -106,14 +106,14 @@ class OrbitDB {
     }
 
     if (!options.keystore) {
-      const keystorePath = path.join(options.directory, options.id || id, '/keystore')
+      const keystorePath = path.join(options.directory, id, '/keystore')
       const keyStorage = await options.storage.createStore(keystorePath)
       options.keystore = new Keystore(keyStorage)
     }
 
     if (!options.identity) {
       options.identity = await Identities.createIdentity({
-        id: options.id || id,
+        id: id,
         keystore: options.keystore
       })
     }