diff --git a/core/src/test/resources/sql/sub-query.iq b/core/src/test/resources/sql/sub-query.iq
index aa43c54d923f..9076a942971a 100644
--- a/core/src/test/resources/sql/sub-query.iq
+++ b/core/src/test/resources/sql/sub-query.iq
@@ -3696,4 +3696,15 @@ SELECT map(SELECT empno, deptno from emp where deptno < 20);
 
 !ok
 
+# [CALCITE-6041] MAP sub-query gives NullPointerException
+SELECT map(SELECT empno, deptno from emp where 1 = 2);
++--------+
+| EXPR$0 |
++--------+
+| {}     |
++--------+
+(1 row)
+
+!ok
+
 # End sub-query.iq