diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 154ba43d51388077cf271474e86ba319328fb408..3ffb8a97d8059832ff92132858e7be03db71a881 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -834,12 +834,14 @@ int32_t avgFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
   if (IS_INTEGER_TYPE(type)) {
     pAvgRes->result = pAvgRes->sum.isum / ((double)pAvgRes->count);
   } else {
-    if (isinf(pAvgRes->sum.dsum) || isnan(pAvgRes->sum.dsum)) {
-      GET_RES_INFO(pCtx)->isNullRes = 1;
-    }
     pAvgRes->result = pAvgRes->sum.dsum / ((double)pAvgRes->count);
   }
 
+  //check for overflow
+  if (isinf(pAvgRes->result) || isnan(pAvgRes->result)) {
+    GET_RES_INFO(pCtx)->isNullRes = 1;
+  }
+
   return functionFinalize(pCtx, pBlock);
 }