diff --git a/.xinitrc b/.xinitrc
index f7f46f7f..0d5880ee 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -32,5 +32,9 @@ if [ -x "$HOME/.config/conky/gen.sh" ]; then
 fi
 if [ -x "$HOME/.firestarter/firestarter" ]; then
 	export FS_DIEONWM=true
-	exec "$HOME/.firestarter/firestarter" -vvv | tee .firestarter.log
+	export STARTUP="$HOME/.firestarter/firestarter"
+fi
+# We'd rather let the system-wide Xsession handle this
+if ! [ -f "/etc/X11/Xsession.d/99x11-common_start" ]; then
+	exec $STARTUP
 fi