diff --git a/bigiron/src/org/labkey/bigiron/mssql/MicrosoftSqlServer2016Dialect.java b/bigiron/src/org/labkey/bigiron/mssql/MicrosoftSqlServer2016Dialect.java
index fccd108ec82..b28bcdc4302 100644
--- a/bigiron/src/org/labkey/bigiron/mssql/MicrosoftSqlServer2016Dialect.java
+++ b/bigiron/src/org/labkey/bigiron/mssql/MicrosoftSqlServer2016Dialect.java
@@ -159,7 +159,7 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws S
         @Override
         public void setObject(int parameterIndex, Object x, int targetSqlType, int scale) throws SQLException
         {
-            if (targetSqlType == Types.TIMESTAMP)
+            if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
                 setObject(parameterIndex, x);
             else
                 super.setObject(parameterIndex, x, targetSqlType, scale);
@@ -168,7 +168,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale
         @Override
         public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException
         {
-            if (targetSqlType == Types.TIMESTAMP)
+            if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
                 setObject(parameterIndex, x);
             else
                 super.setObject(parameterIndex, x, targetSqlType);
@@ -183,7 +183,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException
         @Override
         public void setObject(String parameterName, Object x, int targetSqlType, int scale) throws SQLException
         {
-            if (targetSqlType == Types.TIMESTAMP)
+            if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
                 setObject(parameterName, x);
             else
                 super.setObject(parameterName, x, targetSqlType, scale);
@@ -192,7 +192,7 @@ public void setObject(String parameterName, Object x, int targetSqlType, int sca
         @Override
         public void setObject(String parameterName, Object x, int targetSqlType) throws SQLException
         {
-            if (targetSqlType == Types.TIMESTAMP)
+            if (targetSqlType == Types.TIMESTAMP && x instanceof Timestamp)
                 setObject(parameterName, x);
             else
                 super.setObject(parameterName, x, targetSqlType);