diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommandSet.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommandSet.cs
index 361461f354..4d51c01f86 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommandSet.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommandSet.cs
@@ -155,7 +155,7 @@ internal void Append(SqlCommand command)
                         int offset = p.Offset;
                         int size = p.Size;
                         int countOfBytes = byteValues.Length - offset;
-                        if ((0 != size) && (size < countOfBytes))
+                        if ((size > 0) && (size < countOfBytes))
                         {
                             countOfBytes = size;
                         }
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommandSet.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommandSet.cs
index 4be0ed8d5d..d47f33ed67 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommandSet.cs
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommandSet.cs
@@ -182,7 +182,7 @@ internal void Append(SqlCommand command)
                         int offset = p.Offset;
                         int size = p.Size;
                         int countOfBytes = byteValues.Length - offset;
-                        if ((0 != size) && (size < countOfBytes))
+                        if ((size > 0) && (size < countOfBytes))
                         {
                             countOfBytes = size;
                         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index cf3600d671..d88504b197 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -113,6 +113,7 @@
     <Compile Include="SQL\MirroringTest\ConnectionOnMirroringTest.cs" />
     <Compile Include="SQL\ParallelTransactionsTest\ParallelTransactionsTest.cs" />
     <Compile Include="SQL\SqlBulkCopyTest\CopyWidenNullInexactNumerics.cs" />
+    <Compile Include="SQL\SqlCommand\SqlCommandSetTest.cs" />
     <Compile Include="SQL\SqlCredentialTest\SqlCredentialTest.cs" />
     <Compile Include="SQL\SqlSchemaInfoTest\SqlSchemaInfoTest.cs" />
     <Compile Include="SQL\SqlStatisticsTest\SqlStatisticsTest.cs" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
new file mode 100644
index 0000000000..6d6484de3d
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlTypes;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+{
+    public class SqlCommandSetTest
+    {
+        private static Assembly mds = Assembly.GetAssembly(typeof(SqlConnection));
+
+        [CheckConnStrSetupFact]
+        public void TestByteArrayParameters()
+        {
+            string tableName = DataTestUtility.GetUniqueNameForSqlServer("CMD");
+            string procName = DataTestUtility.GetUniqueNameForSqlServer("CMD");
+            byte[] bArray = new byte[] { 1, 2, 3 };
+
+            using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
+            using (var cmd = new SqlCommand(procName, connection))
+            {
+                try
+                {
+                    connection.Open();
+
+                    setupByteArrayArtifacts(connection, tableName, procName);
+
+                    // Insert with SqlCommand
+                    cmd.CommandType = System.Data.CommandType.StoredProcedure;
+                    SqlCommandBuilder.DeriveParameters(cmd);
+                    cmd.Parameters["@array"].Value = bArray;
+
+                    cmd.ExecuteNonQuery();
+
+                    //Insert with command Set
+                    var commandSetType = mds.GetType("Microsoft.Data.SqlClient.SqlCommandSet");
+                    var cmdSet = Activator.CreateInstance(commandSetType, true);
+                    commandSetType.GetMethod("Append", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).Invoke(cmdSet, new object[] { cmd });
+                    commandSetType.GetProperty("Connection", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).GetSetMethod(true).Invoke(cmdSet, new object[] { connection });
+                    commandSetType.GetMethod("ExecuteNonQuery", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).Invoke(cmdSet, new object[] { });
+
+                    cmd.CommandType = System.Data.CommandType.Text;
+                    cmd.CommandText = $"SELECT * FROM {tableName}";
+                    using (SqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            SqlBytes byteArray = reader.GetSqlBytes(0);
+                            Assert.Equal(byteArray.Length, bArray.Length);
+
+                            for (int i = 0; i < bArray.Length; i++)
+                            {
+                                Assert.Equal(bArray[i], byteArray[i]);
+                            }
+                        }
+                    }
+                }
+                finally
+                {
+                    dropByteArrayArtifacts(connection, tableName, procName);
+                }
+            }
+        }
+
+        private void dropByteArrayArtifacts(SqlConnection connection, string tableName, string procName)
+        {
+            using (SqlCommand cmd = connection.CreateCommand())
+            {
+                cmd.CommandText = $"DROP TABLE IF EXISTS {tableName}";
+                cmd.ExecuteNonQuery();
+
+                cmd.CommandText = $"DROP PROCEDURE IF EXISTS {procName}";
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        private void setupByteArrayArtifacts(SqlConnection connection, string tableName, string procName)
+        {
+            using (SqlCommand cmd = connection.CreateCommand())
+            {
+                cmd.CommandText = $"CREATE TABLE {tableName} (ByteArrayColumn varbinary(max))";
+                cmd.ExecuteNonQuery();
+
+                cmd.CommandText = $"CREATE PROCEDURE {procName} @array varbinary(max) AS BEGIN SET NOCOUNT ON; " +
+                    $"insert into {tableName}(ByteArrayColumn) values(@array) END";
+                cmd.ExecuteNonQuery();
+            }
+        }
+    }
+}