diff --git a/daemon/HaikuDaemon.cpp b/daemon/HaikuDaemon.cpp
index b3afe6e2..a2041fbd 100644
--- a/daemon/HaikuDaemon.cpp
+++ b/daemon/HaikuDaemon.cpp
@@ -189,9 +189,15 @@ namespace util
 					alert->Go ();
 				});
 		}	
-		auto ret = Daemon_Singleton::start ();
-		if (ret && app)
-			app->CreateMainWindow ();
+		bool ret = false;
+		if (app)
+		{	
+			ret = Daemon_Singleton::start ();
+			if (ret)
+				app->CreateMainWindow ();
+		}
+		else
+			ret = DaemonUnix::start ();
 		return ret;
 	}