diff --git a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index c297e45a30..0ea38a5aa5 100644
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -126,17 +126,13 @@ namespace MediaBrowser.Model.Session
 
             set
             {
-                if (value > 10)
+                if (value is null)
                 {
-                    _playbackSpeed = 10;
-                }
-                else if (value < 0.1)
-                {
-                    _playbackSpeed = 0.1;
+                    _playbackSpeed = null;
                 }
                 else
                 {
-                    _playbackSpeed = value;
+                    _playbackSpeed = Math.Clamp((double)value, 0.1, 10.0);
                 }
             }
         }
diff --git a/MediaBrowser.Model/Session/PlayerStateInfo.cs b/MediaBrowser.Model/Session/PlayerStateInfo.cs
index 39126a1f79..d1f0915550 100644
--- a/MediaBrowser.Model/Session/PlayerStateInfo.cs
+++ b/MediaBrowser.Model/Session/PlayerStateInfo.cs
@@ -88,17 +88,13 @@ namespace MediaBrowser.Model.Session
 
             set
             {
-                if (value > 10)
+                if (value is null)
                 {
-                    _playbackSpeed = 10;
-                }
-                else if (value < 0.1)
-                {
-                    _playbackSpeed = 0.1;
+                    _playbackSpeed = null;
                 }
                 else
                 {
-                    _playbackSpeed = value;
+                    _playbackSpeed = Math.Clamp((double)value, 0.1, 10.0);
                 }
             }
         }