diff --git a/Manual.org b/Manual.org
index 2a8d942..2f56afb 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1010,7 +1010,7 @@ lircd0_socket: /var/run/lirc/lircd0
   tags:
     - config
 
-- name: stop, mask and disable lircd.socket, lircd.service and lircd-uinput.service # (the default lirc configuration conflicts with eventlircd)
+- name: stop, mask and disable lircd.socket, lircd.service, lircmd.service and lircd-uinput.service # (the default lirc configuration conflicts with eventlircd)
   systemd:
     name: '{{ item }}'
     enabled: no
@@ -1019,6 +1019,7 @@ lircd0_socket: /var/run/lirc/lircd0
   with_items:
     - lircd.service
     - lircd.socket
+    - lircmd.service
     - lircd-uinput.service
   ignore_errors: yes
   tags:
diff --git a/roles/yavdr-remote/tasks/main.yml b/roles/yavdr-remote/tasks/main.yml
index 49ba690..b04e871 100644
--- a/roles/yavdr-remote/tasks/main.yml
+++ b/roles/yavdr-remote/tasks/main.yml
@@ -26,7 +26,7 @@
   tags:
     - config
 
-- name: stop, mask and disable lircd.socket, lircd.service and lircd-uinput.service # (the default lirc configuration conflicts with eventlircd)
+- name: stop, mask and disable lircd.socket, lircd.service, lircmd.service and lircd-uinput.service # (the default lirc configuration conflicts with eventlircd)
   systemd:
     name: '{{ item }}'
     enabled: no
@@ -35,6 +35,7 @@
   with_items:
     - lircd.service
     - lircd.socket
+    - lircmd.service
     - lircd-uinput.service
   ignore_errors: yes
   tags: