diff --git a/MediaBrowser.Common/Json/Converters/JsonOmdbNotAvailableStringConverter.cs b/MediaBrowser.Common/Json/Converters/JsonOmdbNotAvailableStringConverter.cs
index 2b343a5059..4fec2ea3fd 100644
--- a/MediaBrowser.Common/Json/Converters/JsonOmdbNotAvailableStringConverter.cs
+++ b/MediaBrowser.Common/Json/Converters/JsonOmdbNotAvailableStringConverter.cs
@@ -19,6 +19,8 @@ namespace MediaBrowser.Common.Json.Converters
                 {
                     return null;
                 }
+
+                return str;
             }
 
             return JsonSerializer.Deserialize<string>(ref reader, options);
diff --git a/tests/Jellyfin.Common.Tests/Json/JsonOmdbConverterTests.cs b/tests/Jellyfin.Common.Tests/Json/JsonOmdbConverterTests.cs
index aae95e7314..e1436a648e 100644
--- a/tests/Jellyfin.Common.Tests/Json/JsonOmdbConverterTests.cs
+++ b/tests/Jellyfin.Common.Tests/Json/JsonOmdbConverterTests.cs
@@ -7,10 +7,20 @@ using Xunit;
 
 namespace Jellyfin.Common.Tests.Json
 {
-    public static class JsonOmdbConverterTests
+    public class JsonOmdbConverterTests
     {
+        private readonly JsonSerializerOptions _options;
+
+        public JsonOmdbConverterTests()
+        {
+            _options = new JsonSerializerOptions();
+            _options.Converters.Add(new JsonOmdbNotAvailableStringConverter());
+            _options.Converters.Add(new JsonOmdbNotAvailableStructConverter<int>());
+            _options.NumberHandling = JsonNumberHandling.AllowReadingFromString;
+        }
+
         [Fact]
-        public static void Deserialize_Omdb_Response_Not_Available_Success()
+        public void Deserialize_Omdb_Response_Not_Available_Success()
         {
             const string Input = "{\"Title\":\"Chapter 1\",\"Year\":\"2013\",\"Rated\":\"TV-MA\",\"Released\":\"01 Feb 2013\",\"Season\":\"N/A\",\"Episode\":\"N/A\",\"Runtime\":\"55 min\",\"Genre\":\"Drama\",\"Director\":\"David Fincher\",\"Writer\":\"Michael Dobbs (based on the novels by), Andrew Davies (based on the mini-series by), Beau Willimon (created for television by), Beau Willimon, Sam Forman (staff writer)\",\"Actors\":\"Kevin Spacey, Robin Wright, Kate Mara, Corey Stoll\",\"Plot\":\"Congressman Francis Underwood has been declined the chair for Secretary of State. He's now gathering his own team to plot his revenge. Zoe Barnes, a reporter for the Washington Herald, will do anything to get her big break.\",\"Language\":\"English\",\"Country\":\"USA\",\"Awards\":\"N/A\",\"Poster\":\"https://m.media-amazon.com/images/M/MV5BMTY5MTU4NDQzNV5BMl5BanBnXkFtZTgwMzk2ODcxMzE@._V1_SX300.jpg\",\"Ratings\":[{\"Source\":\"Internet Movie Database\",\"Value\":\"8.7/10\"}],\"Metascore\":\"N/A\",\"imdbRating\":\"8.7\",\"imdbVotes\":\"6736\",\"imdbID\":\"tt2161930\",\"seriesID\":\"N/A\",\"Type\":\"episode\",\"Response\":\"True\"}";
             var seasonRootObject = JsonSerializer.Deserialize<OmdbProvider.RootObject>(Input, JsonDefaults.GetOptions());
@@ -21,36 +31,68 @@ namespace Jellyfin.Common.Tests.Json
         }
 
         [Fact]
-        public static void Deserialize_Not_Available_Int_Success()
+        public void Deserialize_Not_Available_Int_Success()
         {
             const string Input = "\"N/A\"";
-            var options = new JsonSerializerOptions
-            {
-                NumberHandling = JsonNumberHandling.AllowReadingFromString,
-                Converters =
-                {
-                    new JsonOmdbNotAvailableStructConverter<int>()
-                }
-            };
-
-            var result = JsonSerializer.Deserialize<int?>(Input, options);
+
+            var result = JsonSerializer.Deserialize<int?>(Input, _options);
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Deserialize_Not_Available_String_Success()
+        {
+            const string Input = "\"N/A\"";
+
+            var result = JsonSerializer.Deserialize<string>(Input, _options);
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Deserialize_Normal_String_Success()
+        {
+            const string Expected = "Jellyfin";
+            const string Input = "\"Jellyfin\"";
+
+            var result = JsonSerializer.Deserialize<string>(Input, _options);
+            Assert.Equal(Expected, result);
+        }
+
+        [Fact]
+        public void Deserialize_Null_Success()
+        {
+            const string Input = "null";
+
+            var result = JsonSerializer.Deserialize<string>(Input, _options);
             Assert.Null(result);
         }
 
         [Fact]
-        public static void Deserialize_Not_Available_String_Success()
+        public void Deserialize_Number_Success()
+        {
+            const int Number = 8;
+            const string Input = "8";
+
+            var result = JsonSerializer.Deserialize<int>(Input, _options);
+            Assert.Equal(Number, result);
+        }
+
+        [Fact]
+        public void Deserialize_Quoted_Number_Success()
+        {
+            const int Number = 8;
+            const string Input = "\"8\"";
+
+            var result = JsonSerializer.Deserialize<int>(Input, _options);
+            Assert.Equal(Number, result);
+        }
+
+        [Fact]
+        public void Deserialize_NA_Number_Success()
         {
             const string Input = "\"N/A\"";
-            var options = new JsonSerializerOptions
-            {
-                Converters =
-                {
-                    new JsonOmdbNotAvailableStringConverter()
-                }
-            };
-
-            options.Converters.Add(new JsonOmdbNotAvailableStringConverter());
-            var result = JsonSerializer.Deserialize<string>(Input, options);
+
+            var result = JsonSerializer.Deserialize<int?>(Input, _options);
             Assert.Null(result);
         }
     }