diff --git a/packages/multimedia/hts-tvheadend/scripts/tvheadend_startup b/packages/multimedia/hts-tvheadend/scripts/tvheadend_startup
index 132e5848a7..1137a8ea29 100755
--- a/packages/multimedia/hts-tvheadend/scripts/tvheadend_startup
+++ b/packages/multimedia/hts-tvheadend/scripts/tvheadend_startup
@@ -21,5 +21,5 @@
 ################################################################################
 
 if [ ! $(pidof tvheadend) ];then
-    tvheadend -C -s -f -u root -g root
+  tvheadend -C -s -f -u root -g root
 fi
\ No newline at end of file
diff --git a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules
index ea19c0a8ec..8e00208484 100644
--- a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules
+++ b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules
@@ -24,7 +24,7 @@ SUBSYSTEM!="dvb", GOTO="end"
 ENV{DVB_DEVICE_TYPE}!="frontend", GOTO="end"
 
 # Start TVHeadend if dvb frontend is starting
-ACTION=="add", RUN+="/usr/bin/tvheadend -C -s -f -u root -g root"
 ACTION=="add", RUN+="/lib/udev/tvheadend_startup"
+ACTION=="remove", RUN+="/usr/bin/killall tvheadend"
 
 LABEL="end"