diff --git a/src/Microsoft.Extensions.Primitives/StringValues.cs b/src/Microsoft.Extensions.Primitives/StringValues.cs
index d8da66d895a..77af635b805 100644
--- a/src/Microsoft.Extensions.Primitives/StringValues.cs
+++ b/src/Microsoft.Extensions.Primitives/StringValues.cs
@@ -27,8 +27,23 @@ public StringValues(string value)
 
         public StringValues(string[] values)
         {
-            _value = null;
-            _values = values;
+            if (values == null || values.Length == 0)
+            {
+                // Set null and empty arrays to null
+                _value = null;  // Both null is required for 
+                _values = null; // IsNull property to work correctly
+            }
+            else if (values.Length == 1)
+            {
+                // Set single item arrays to the string value
+                _values = null;
+                _value = values[0];
+            }
+            else
+            {
+                _value = null;
+                _values = values;
+            }
         }
 
         public static implicit operator StringValues(string value)
@@ -53,6 +68,8 @@ public static implicit operator string[] (StringValues value)
 
         public int Count => _value != null ? 1 : (_values?.Length ?? 0);
 
+        public bool IsNull => _value == null && _values == null;
+
         bool ICollection<string>.IsReadOnly
         {
             get { return true; }
@@ -85,19 +102,7 @@ public override string ToString()
             return GetStringValue() ?? string.Empty;
         }
 
-        private string GetStringValue()
-        {
-            if (_values == null)
-            {
-                return _value;
-            }
-            switch (_values.Length)
-            {
-                case 0: return null;
-                case 1: return _values[0];
-                default: return string.Join(",", _values);
-            }
-        }
+        private string GetStringValue() => (_values == null) ? _value : string.Join(",", _values);
 
         public string[] ToArray()
         {
@@ -225,29 +230,25 @@ public static bool IsNullOrEmpty(StringValues value)
             {
                 return string.IsNullOrEmpty(value._value);
             }
-            switch (value._values.Length)
-            {
-                case 0: return true;
-                case 1: return string.IsNullOrEmpty(value._values[0]);
-                default: return false;
-            }
+
+            return false;
         }
 
         public static StringValues Concat(StringValues values1, StringValues values2)
         {
-            var count1 = values1.Count;
-            var count2 = values2.Count;
 
-            if (count1 == 0)
+            if (values1.IsNull)
             {
                 return values2;
             }
 
-            if (count2 == 0)
+            if (values2.IsNull)
             {
                 return values1;
             }
 
+            var count1 = values1.Count;
+            var count2 = values2.Count;
             var combined = new string[count1 + count2];
             values1.CopyTo(combined, 0);
             values2.CopyTo(combined, count1);
@@ -261,12 +262,12 @@ public static StringValues Concat(in StringValues values, string value)
                 return values;
             }
 
-            var count = values.Count;
-            if (count == 0)
+            if (values.IsNull)
             {
                 return new StringValues(value);
             }
 
+            var count = values.Count;
             var combined = new string[count + 1];
             values.CopyTo(combined, 0);
             combined[count] = value;
@@ -280,12 +281,12 @@ public static StringValues Concat(string value, in StringValues values)
                 return values;
             }
 
-            var count = values.Count;
-            if (count == 0)
+            if (values.IsNull)
             {
                 return new StringValues(value);
             }
 
+            var count = values.Count;
             var combined = new string[count + 1];
             combined[0] = value;
             values.CopyTo(combined, 1);
@@ -420,12 +421,12 @@ public override bool Equals(object obj)
         {
             if (obj == null)
             {
-                return Equals(this, StringValues.Empty);
+                return this.IsNull;
             }
 
-            if (obj is string)
+            if (obj is string str)
             {
-                return Equals(this, (string)obj);
+                return this._value == str;
             }
             
             if (obj is string[])
@@ -514,4 +515,4 @@ public void Dispose()
             }
         }
     }
-}
+}
\ No newline at end of file