diff --git a/data/gala@wayland.service.in b/data/gala@wayland.service.in
index 52e2ad229..fe0a4abe4 100644
--- a/data/gala@wayland.service.in
+++ b/data/gala@wayland.service.in
@@ -22,7 +22,7 @@ Type=notify
 ExecStart=@bindir@/gala
 
 # unset some environment variables that were set by the compositor and won't work now that the compositor is gone
-ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY'
+ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY && rm -f "$XDG_RUNTIME_DIR/wayland-0" "$XDG_RUNTIME_DIR/wayland-0.lock"'
 
 # On wayland we cannot restart
 Restart=no