diff --git a/units/systemd-oomd.socket b/units/systemd-oomd.socket
index 0002a95bab..4e24342f58 100644
--- a/units/systemd-oomd.socket
+++ b/units/systemd-oomd.socket
@@ -21,6 +21,7 @@ ConditionPathExists=/proc/pressure/memory
 [Socket]
 ListenStream=/run/systemd/oom/io.systemd.ManagedOOM
 SocketMode=0666
+RemoveOnStop=yes
 
 [Install]
 WantedBy=sockets.target
diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket
index 768253a2b0..6ef1adeca7 100644
--- a/units/systemd-userdbd.socket
+++ b/units/systemd-userdbd.socket
@@ -17,6 +17,7 @@ Before=sockets.target
 ListenStream=/run/systemd/userdb/io.systemd.Multiplexer
 Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch /run/systemd/userdb/io.systemd.DropIn
 SocketMode=0666
+RemoveOnStop=yes
 
 [Install]
 WantedBy=sockets.target