diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java
index 9fa2586173a38c04d198f0a505e7634724e13e23..fd8e372ed95fa2c84f4f5c6b7d15dd282bef272f 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSessionFactoryImpl.java
@@ -38,6 +38,9 @@ public class MailboxSessionFactoryImpl implements MailboxSessionFactory {
 		this.streamWriterFactory = streamWriterFactory;
 		this.streamReaderFactory = streamReaderFactory;
 		this.db = db;
+
+		// FIXME: using temporary storage for now
+		mailboxStorage = new MailboxStorageImpl();
 	}
 
 	@Override
@@ -61,10 +64,6 @@ public class MailboxSessionFactoryImpl implements MailboxSessionFactory {
 						streamReaderFactory, mailboxProtocol,
 						transportMaxLatency, transportMaxIdleTime, db);
 			case MAILBOX_OWNER:
-				if (mailboxStorage == null) {
-					// FIXME: using temporary storage for now
-					mailboxStorage = new MailboxStorageImpl();
-				}
 				return new MailboxOwnerSession(contactId, ioExecutor,
 						keyManager, syncSessionFactory, streamWriterFactory,
 						streamReaderFactory, mailboxProtocol,