diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index ef6c11c3f2..2e3e090777 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -48,6 +48,7 @@ case "$1" in
   stop)
         echo "Stopping XServer"
         killproc xinit
+        chvt 1
   ;;
 
   restart)