diff --git a/lircd.service b/lircd.service
index c765deb..231df21 100644
--- a/lircd.service
+++ b/lircd.service
@@ -5,11 +5,11 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/lirc
-ExecStartPre=/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
+ExecStartPre=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
     echo lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
 ExecStart=/usr/sbin/lircd ${LIRCD_OPTIONS} \
-    --driver $LIRC_DRIVER --device ${LIRC_DEVICE}  --nodaemon
-ExecStopPost=/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
+    --driver ${LIRC_DRIVER} --device ${LIRC_DEVICE}  --nodaemon
+ExecStopPost=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
     echo -lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
 
 [Install]