diff --git a/src/shell.c b/src/shell.c
index 6afdf3aed..2b61202cc 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -885,6 +885,11 @@ launch_screensaver(struct wl_shell *shell)
 	if (!shell->screensaver.path)
 		return;
 
+	if (shell->screensaver.process.pid != 0) {
+		fprintf(stderr, "old screensaver still running\n");
+		return;
+	}
+
 	weston_client_launch(shell->compositor,
 			   &shell->screensaver.process,
 			   shell->screensaver.path,