diff --git a/custom_components/teufel_raumfeld/media_player.py b/custom_components/teufel_raumfeld/media_player.py
index a62fcf1..95952ea 100644
--- a/custom_components/teufel_raumfeld/media_player.py
+++ b/custom_components/teufel_raumfeld/media_player.py
@@ -296,7 +296,7 @@ def is_volume_muted(self):
     @property
     def media_duration(self):
         """Duration of current playing media in seconds."""
-        return self._media_duration
+        return self._media_duration if self._media_duration else None
 
     @property
     def media_position(self):