diff --git a/src/query/src/qFill.c b/src/query/src/qFill.c
index 205c2173f3880270c12272e878478c61858523b9..9694dac7db152d1b5851629fe349655002c474e8 100644
--- a/src/query/src/qFill.c
+++ b/src/query/src/qFill.c
@@ -120,7 +120,7 @@ static void doFillOneRowResult(SFillInfo* pFillInfo, void** data, char** srcData
         bool exceedMax = false, exceedMin = false;
         point1 = (SPoint){.key = *(TSKEY*)(prev), .val = prev + pCol->col.offset};
         point2 = (SPoint){.key = ts, .val = srcData[i] + pFillInfo->index * bytes};
-        if (isNull(point2.val, type)) {
+        if (isNull(point1.val, type) || isNull(point2.val, type)) {
           setNull(val1, pCol->col.type, bytes);
           continue;
         }