diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index ba5ca0ca..d91ef15c 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -37,7 +37,6 @@ etc/qubes-rpc/qubes.VMRootShell
 etc/qubes-rpc/qubes.VMExec
 etc/qubes-rpc/qubes.VMExecGUI
 etc/qubes-rpc/qubes.VMRootExec
-etc/qubes-rpc/qubes.WaitForSession
 etc/qubes-rpc/qubes.WaitForRunningSystem
 etc/qubes-rpc/qubes.WaitForNetworkUplink
 etc/qubes-rpc/qubes.GetDate
diff --git a/qubes-rpc/Makefile b/qubes-rpc/Makefile
index 0c2673f6..ff17defd 100644
--- a/qubes-rpc/Makefile
+++ b/qubes-rpc/Makefile
@@ -78,7 +78,6 @@ install:
 		qubes.SuspendPre qubes.SuspendPost qubes.GetAppmenus \
 		qubes.SuspendPreAll \
 		qubes.SuspendPostAll \
-		qubes.WaitForSession \
 		qubes.WaitForRunningSystem \
 		qubes.WaitForNetworkUplink \
 		qubes.DetachPciDevice \
diff --git a/qubes-rpc/qubes.WaitForSession b/qubes-rpc/qubes.WaitForSession
deleted file mode 100755
index 9146b24e..00000000
--- a/qubes-rpc/qubes.WaitForSession
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -eu
-
-if test "$(qubesdb-read --default=True /qubes-gui-enabled)" = "True"; then
-    user="$(qubesdb-read /default-user || echo 'user')"
-    while ! [ -e "/var/run/qubes/qrexec-server.$user.sock" ]; do
-        sleep 0.1
-    done
-fi
-
-systemctl --user --wait --quiet is-system-running
-
-exit 0
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index be80b781..12279ab9 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -911,7 +911,6 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/qubes-rpc/qubes.SuspendPreAll
 %config(noreplace) /etc/qubes-rpc/qubes.SuspendPost
 %config(noreplace) /etc/qubes-rpc/qubes.SuspendPostAll
-%config(noreplace) /etc/qubes-rpc/qubes.WaitForSession
 %config(noreplace) /etc/qubes-rpc/qubes.WaitForRunningSystem
 %config(noreplace) /etc/qubes-rpc/qubes.WaitForNetworkUplink
 %config(noreplace) /etc/qubes-rpc/qubes.DetachPciDevice