diff --git a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
index 4e4fb92d61b..95e66f20d3c 100644
--- a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
+++ b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
@@ -116,9 +116,11 @@
 
                             <foreach item="geneFilterQuery" collection="geneFilterQueryList" open=" AND ((" separator=") OR (" close="))">
                                 hugo_gene_symbol = #{geneFilterQuery.hugoGeneSymbol}
-                                <foreach item="alteration" collection="geneFilterQuery.getAlterations()" open="AND (" separator=") OR (" close=")">
-                                   cna_alteration = #{alteration.code}
-                                </foreach>
+                                <if test="geneFilterQuery.getAlterations() != null">
+                                    <foreach item="alteration" collection="geneFilterQuery.getAlterations()" open="AND (" separator=") OR (" close=")">
+                                        cna_alteration = #{alteration.code}
+                                    </foreach>
+                                </if>
                             </foreach>
                         </where>
                     </foreach>