diff --git a/utils/funcexp/func_timediff.cpp b/utils/funcexp/func_timediff.cpp
index 369bb80a1..c4de35a0d 100644
--- a/utils/funcexp/func_timediff.cpp
+++ b/utils/funcexp/func_timediff.cpp
@@ -118,7 +118,10 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
 
         case execplan::CalpontSystemCatalog::TIME:
         case execplan::CalpontSystemCatalog::DATETIME:
-            if (type1 != type2)
+            // Diff between time and datetime returns NULL in MariaDB
+            if ((type2 == execplan::CalpontSystemCatalog::TIME ||
+                 type2 == execplan::CalpontSystemCatalog::DATETIME) &&
+                 type1 != type2)
             {
                 isNull = true;
                 break;