diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
index c7928619..ba163e27 100644
--- a/pvr.hts/addon.xml.in
+++ b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="20.6.3"
+  version="20.6.4"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>
diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
index dd59a918..a9e193ac 100644
--- a/pvr.hts/changelog.txt
+++ b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+v20.6.4
+- Fix TV channels stuttering after wake from suspend
+
 v20.6.3
 - Translations updates from Weblate
 	- fi_fi
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 743a6b4b..861d5565 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -1881,6 +1881,10 @@ void CTvheadend::SyncInitCompleted()
     return;
 
   /* Rebuild state */
+  for (auto* dmx : m_dmx)
+    dmx->RebuildState();
+
+  m_vfs->RebuildState();
   m_timeRecordings.RebuildState();
   m_autoRecordings.RebuildState();
 
@@ -2017,11 +2021,6 @@ void CTvheadend::SyncEpgCompleted()
 
 void CTvheadend::SyncCompleted()
 {
-  for (auto* dmx : m_dmx)
-    dmx->RebuildState();
-
-  m_vfs->RebuildState();
-
   SyncEpgCompleted();
 
   m_asyncState.SetState(ASYNC_DONE);