diff --git a/.xinitrc b/.xinitrc
index d4a7db4..3a2b9a5 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -9,13 +9,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     unset f
 fi
 
-{ emacs --daemon & } && sleep 1
-
 pidof mpdscribble >& /dev/null
 if [ $? -ne 0 ]
 then
     mpdscribble &
 fi
 
-test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\""
+test -n "$1" && wm=$1 || wm="emacs"
 exec $wm