diff --git a/WHATS_NEW b/WHATS_NEW
index 6791f3415..dcde55030 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.107 - 
 ==================================
+  Use RemoveOnStop for lvm2-lvmetad.socket systemd unit.
   Add thin-generic configuration profile for generic thin settings.
   Fix crash when reporting of empty labels on pvs.
   Use retry_deactivation also when cleaning orphan devices.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 976f927ea..90dd5f518 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.88 - 
 =================================
+  Use RemoveOnStop for dm-event.socket systemd unit.
   Document env var 'DM_DEFAULT_NAME_MANGLING_MODE' in dmsetup man page.
   Warn user about incorrect use of cookie with 'dmsetup remove --force'.
   Also recognize 'help'/'?' as reserved sort key name to show help.
diff --git a/scripts/dm_event_systemd_red_hat.socket.in b/scripts/dm_event_systemd_red_hat.socket.in
index b27c68d94..80bcbb988 100644
--- a/scripts/dm_event_systemd_red_hat.socket.in
+++ b/scripts/dm_event_systemd_red_hat.socket.in
@@ -7,6 +7,7 @@ DefaultDependencies=no
 ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-server
 ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client
 SocketMode=0600
+RemoveOnStop=true
 
 [Install]
 WantedBy=sockets.target
diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.socket.in b/scripts/lvm2_lvmetad_systemd_red_hat.socket.in
index 071fd6412..9575f98a6 100644
--- a/scripts/lvm2_lvmetad_systemd_red_hat.socket.in
+++ b/scripts/lvm2_lvmetad_systemd_red_hat.socket.in
@@ -6,6 +6,7 @@ DefaultDependencies=no
 [Socket]
 ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket
 SocketMode=0600
+RemoveOnStop=true
 
 [Install]
 WantedBy=sysinit.target