diff --git a/src/libraries/System.Private.CoreLib/src/System/Convert.cs b/src/libraries/System.Private.CoreLib/src/System/Convert.cs
index a0c7442285309..8bf81152991ee 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Convert.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Convert.cs
@@ -2999,7 +2999,7 @@ public static OperationStatus FromHexString(ReadOnlySpan<char> source, Span<byte
                 return remainder == 1 ? OperationStatus.NeedMoreData : OperationStatus.Done;
             }
 
-            var result = OperationStatus.Done;
+            OperationStatus result;
 
             if (destination.Length < quotient)
             {
@@ -3007,11 +3007,19 @@ public static OperationStatus FromHexString(ReadOnlySpan<char> source, Span<byte
                 quotient = destination.Length;
                 result = OperationStatus.DestinationTooSmall;
             }
-            else if (remainder == 1)
+            else
             {
-                source = source.Slice(0, source.Length - 1);
-                destination = destination.Slice(0, destination.Length - 1);
-                result = OperationStatus.NeedMoreData;
+                if (remainder == 1)
+                {
+                    source = source.Slice(0, source.Length - 1);
+                    result = OperationStatus.NeedMoreData;
+                }
+                else
+                {
+                    result = OperationStatus.Done;
+                }
+
+                destination = destination.Slice(0, quotient);
             }
 
             if (!HexConverter.TryDecodeFromUtf16(source, destination, out charsConsumed))
diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromHexString.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromHexString.cs
index dc80b4c0e9b78..fd8bcd6c8e05d 100644
--- a/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromHexString.cs
+++ b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/Convert.FromHexString.cs
@@ -136,6 +136,42 @@ public static void TooShortDestination()
             Assert.Equal(destinationSize, bytesWritten);
         }
 
+        [Fact]
+        public static void TooLongDestination()
+        {
+            string hex = Convert.ToHexString([255, 255, 255]);
+            byte[] buffer = new byte[100];
+            var status = Convert.FromHexString(hex, buffer, out int charsConsumed, out int bytesWritten);
+
+            Assert.Equal(OperationStatus.Done, status);
+            Assert.Equal(hex.Length, charsConsumed);
+            Assert.Equal(hex.Length / 2, bytesWritten);
+        }
+
+        [Fact]
+        public static void ExactDestination()
+        {
+            string hex = "ffffff";
+            byte[] buffer = new byte[3];
+            var status = Convert.FromHexString(hex, buffer, out int charsConsumed, out int bytesWritten);
+
+            Assert.Equal(OperationStatus.Done, status);
+            Assert.Equal(hex.Length, charsConsumed);
+            Assert.Equal(hex.Length / 2, bytesWritten);
+        }
+
+        [Fact]
+        public static void ExactDestination_TrailingCharacter()
+        {
+            string hex = "fffff"; 
+            byte[] buffer = new byte[2];
+            var status = Convert.FromHexString(hex, buffer, out int charsConsumed, out int bytesWritten);
+
+            Assert.Equal(OperationStatus.NeedMoreData, status);
+            Assert.Equal(hex.Length - 1, charsConsumed);
+            Assert.Equal(hex.Length / 2, bytesWritten);
+        }
+
         [Fact]
         public static void NeedMoreData_OrFormatException()
         {
@@ -152,6 +188,7 @@ public static void NeedMoreData_OrFormatException()
             Assert.Equal(0, consumed);
             Assert.Equal(0, written);
 
+            // Odd length
             spanHex = hex.AsSpan(0, hex.Length - 1);
 
             var oneOffResult = Convert.FromHexString(spanHex, destination, out consumed, out written);
@@ -160,6 +197,15 @@ public static void NeedMoreData_OrFormatException()
             Assert.Equal(OperationStatus.NeedMoreData, oneOffResult);
             Assert.Equal(spanHex.Length - 1, consumed);
             Assert.Equal((spanHex.Length - 1) / 2, written);
+
+            // Even length
+            spanHex = hex.AsSpan(0, hex.Length - 2);
+
+            var twoOffResult = Convert.FromHexString(spanHex, destination, out consumed, out written);
+
+            Assert.Equal(OperationStatus.Done, twoOffResult);
+            Assert.Equal(spanHex.Length, consumed);
+            Assert.Equal(spanHex.Length / 2, written);
         }
     }
 }