diff --git a/app/classes.py b/app/classes.py
index 2abf95c..5372927 100644
--- a/app/classes.py
+++ b/app/classes.py
@@ -197,6 +197,11 @@ class PlaylistTrack:
                 milliseconds=update_graph_at_ms
             )
 
+        # Calculate time fade_graph should start updating
+        if self.fade_at:
+            update_graph_at_ms = max(0, self.fade_at - Config.FADE_CURVE_MS_BEFORE_FADE - 1)
+            self.fade_graph_start_updates = now + timedelta(milliseconds=update_graph_at_ms)
+
 
 class AddFadeCurve(QObject):
     """