diff --git a/.xinitrc b/.xinitrc
index 4a762235..1da22e23 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -14,12 +14,12 @@ fi
 ## Source environment config.
 [ -f ~/.xprofile ] && . ~/.xprofile
 
-## Launch session
-if [ $# -eq 1 ] && command -v $1 >/dev/null 2>&1; then
-	exec $1
-else
+if [ $# -eq 0 ]; then
+	## With no argument, launch custom session.
 	conky | dzen2 -p -dock -ta l -fn "DejaVu Sans Mono" &
 	## `exwm-enable' has to be called before the frame is spawned.
-	emacs --daemon -f exwm-enable
+	emacs --daemon --eval "(require 'exwm)" -f exwm-enable
 	exec emacsclient -c
 fi
+
+exec "$@"