diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 3b9fa46f66..1b32cdb17b 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -812,7 +812,7 @@ static bool pushDownCondOptIsColEqualOnCond(SJoinLogicNode* pJoin, SNode* pCond,
     return false;
   }
   SOperatorNode* pOper = (SOperatorNode*)pCond;
-  if (QUERY_NODE_COLUMN != nodeType(pOper->pLeft) || QUERY_NODE_COLUMN != nodeType(pOper->pRight)) {
+  if (QUERY_NODE_COLUMN != nodeType(pOper->pLeft) || NULL == pOper->pRight || QUERY_NODE_COLUMN != nodeType(pOper->pRight)) {
     return false;
   }
   SColumnNode* pLeft = (SColumnNode*)(pOper->pLeft);
diff --git a/tests/system-test/2-query/stbJoin.py b/tests/system-test/2-query/stbJoin.py
index 677704648c..6eb95349fe 100644
--- a/tests/system-test/2-query/stbJoin.py
+++ b/tests/system-test/2-query/stbJoin.py
@@ -112,6 +112,18 @@ class TDTestCase:
         tdSql.query(f"select a.* from sta a join stb b on a.tg1 != b.tg1 and a.ts=b.ts;")
         tdSql.checkRows(36)
 
+        tdSql.query(f"select a.* from sta a join stb b on a.ts=b.ts and a.ts is null;")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select a.* from sta a join stb b on a.ts=b.ts and a.ts is not null;")
+        tdSql.checkRows(48)
+
+        tdSql.query(f"select a.* from sta a ,stb b where a.ts=b.ts and a.ts is null;")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select a.* from sta a ,stb b where a.ts=b.ts and a.ts is not null;")
+        tdSql.checkRows(48)
+
 #        tdSql.checkData(0,1,10)
 
         tdSql.error(f"select a.* from sta a join stb b on a.tg1=b.tg1 where a.ts=b.ts or a.tg2=b.tg2;")