diff --git a/src/cpp/ripple/Application.cpp b/src/cpp/ripple/Application.cpp
index 9cbbdc766..f0c360265 100644
--- a/src/cpp/ripple/Application.cpp
+++ b/src/cpp/ripple/Application.cpp
@@ -26,9 +26,9 @@ Application* theApp = NULL;
 
 DatabaseCon::DatabaseCon(const std::string& strName, const char *initStrings[], int initCount)
 {
-	boost::filesystem::path	pPath	= theConfig.RUN_STANDALONE && !Config::LOAD
+	boost::filesystem::path	pPath	= (theConfig.RUN_STANDALONE && (!theConfig.START_UP != Config::LOAD))
 										? ""								// Use temporary files.
-										: theConfig.DATA_DIR / strName;		// Use regular db files.
+										: (theConfig.DATA_DIR / strName);		// Use regular db files.
 
 	mDatabase = new SqliteDatabase(pPath.string().c_str());
 	mDatabase->connect();