1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp
index 885d74f..850c1b2 100644
--- a/Swiften/Client/MemoryStorages.cpp
+++ b/Swiften/Client/MemoryStorages.cpp
@@ -14,29 +14,29 @@
 namespace Swift {
 
 MemoryStorages::MemoryStorages(CryptoProvider* crypto) {
 	vcardStorage = new VCardMemoryStorage(crypto);
 	capsStorage = new CapsMemoryStorage();
 	avatarStorage = new AvatarMemoryStorage();
 	rosterStorage = new RosterMemoryStorage();
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
 	historyStorage = new SQLiteHistoryStorage(":memory:");
+#else
+	historyStorage = NULL;
 #endif
 }
 
 MemoryStorages::~MemoryStorages() {
 	delete rosterStorage;
 	delete avatarStorage;
 	delete capsStorage;
 	delete vcardStorage;
-#ifdef SWIFT_EXPERIMENTAL_HISTORY
 	delete historyStorage;
-#endif
 }
 
 VCardStorage* MemoryStorages::getVCardStorage() const {
 	return vcardStorage;
 }
 
 CapsStorage* MemoryStorages::getCapsStorage() const {
 	return capsStorage;
 }