diff --git a/pvr.vuplus/addon.xml.in b/pvr.vuplus/addon.xml.in
index 13dbe110..ed81bf95 100644
--- a/pvr.vuplus/addon.xml.in
+++ b/pvr.vuplus/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vuplus"
-  version="21.3.0"
+  version="21.3.1"
   name="Enigma2 Client"
   provider-name="Joerg Dembski and Ross Nicholson">
   <requires>@ADDON_DEPENDS@
diff --git a/pvr.vuplus/changelog.txt b/pvr.vuplus/changelog.txt
index ba705586..f4ca5c17 100644
--- a/pvr.vuplus/changelog.txt
+++ b/pvr.vuplus/changelog.txt
@@ -1,3 +1,6 @@
+v21.3.1
+- Also test channel name when setting autotimer parents to timers
+
 v21.3.0
 - Add expert setting to toggle using OpenWebIf internal MovieList on/off
 
diff --git a/src/enigma2/Timers.cpp b/src/enigma2/Timers.cpp
index b15ae414..df203a2a 100644
--- a/src/enigma2/Timers.cpp
+++ b/src/enigma2/Timers.cpp
@@ -1294,7 +1294,8 @@ bool Timers::TimerUpdatesAuto()
     {
       const std::string autotimerTag = ConvertToAutoTimerTag(autoTimer.GetTitle());
 
-      if (timer.GetType() == Timer::EPG_AUTO_ONCE && timer.ContainsTag(TAG_FOR_AUTOTIMER) && timer.ContainsTag(autotimerTag))
+      if (timer.GetType() == Timer::EPG_AUTO_ONCE && timer.ContainsTag(TAG_FOR_AUTOTIMER) &&
+          timer.ContainsTag(autotimerTag) && autoTimer.GetChannelName() == timer.GetChannelName())
       {
         timer.SetParentClientIndex(autoTimer.GetClientIndex());
         continue;