diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
index 01db7146d..6c345a7df 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
@@ -738,13 +738,13 @@ bool OBSApp::InitTheme()
 {
 	const char *themeName = config_get_string(globalConfig, "General",
 			"Theme");
-
 	if (!themeName)
 		themeName = "Default";
 
-	stringstream t;
-	t << themeName;
-	return SetTheme(t.str());
+	if (strcmp(themeName, "Default") != 0 && SetTheme(themeName))
+		return true;
+
+	return SetTheme("Default");
 }
 
 OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)