diff --git a/tutoraspects/templates/openedx-assets/queries/fact_problem_engagement.sql b/tutoraspects/templates/openedx-assets/queries/fact_problem_engagement.sql
index 83b5918f2..3c254fed1 100644
--- a/tutoraspects/templates/openedx-assets/queries/fact_problem_engagement.sql
+++ b/tutoraspects/templates/openedx-assets/queries/fact_problem_engagement.sql
@@ -20,10 +20,10 @@ with
         where
             1 = 1
             {% raw %}
-            {% if from_dttm is not none %}
+            {% if from_dttm %}
                 and attempted_on > date('{{ from_dttm }}')
             {% endif %}
-            {% if to_dttm is not none %}
+            {% if to_dttm %}
                 and attempted_on < date('{{ to_dttm }}')
             {% endif %}
             {% endraw %}
diff --git a/tutoraspects/templates/openedx-assets/queries/fact_video_engagement.sql b/tutoraspects/templates/openedx-assets/queries/fact_video_engagement.sql
index a0954365c..ca08a53cb 100644
--- a/tutoraspects/templates/openedx-assets/queries/fact_video_engagement.sql
+++ b/tutoraspects/templates/openedx-assets/queries/fact_video_engagement.sql
@@ -19,10 +19,10 @@ with
         where
             1 = 1
             {% raw %}
-            {% if from_dttm is not none %}
+            {% if from_dttm %}
                 and viewed_on > date('{{ from_dttm }}')
             {% endif %}
-            {% if to_dttm is not none %}
+            {% if to_dttm %}
                 and viewed_on < date('{{ to_dttm }}')
             {% endif %}
             {% endraw %}