diff --git a/api/chalicelib/core/heatmaps.py b/api/chalicelib/core/heatmaps.py
index 2e152dae2..da38e453c 100644
--- a/api/chalicelib/core/heatmaps.py
+++ b/api/chalicelib/core/heatmaps.py
@@ -224,9 +224,9 @@ def search_short_session(data: schemas.HeatMapSessionsSearch, project_id, user_i
             break
     for f in data.events:
         if f.type == schemas.EventType.LOCATION:
-            location_condition = f.model_copy()
             if len(f.value) == 0:
                 f.operator = schemas.SearchEventOperator.IS_ANY
+            location_condition = f.model_copy()
         elif f.type == schemas.EventType.CLICK:
             no_click = False
             if len(f.value) == 0:
diff --git a/ee/api/chalicelib/core/heatmaps.py b/ee/api/chalicelib/core/heatmaps.py
index c0a19a757..5f18f1f86 100644
--- a/ee/api/chalicelib/core/heatmaps.py
+++ b/ee/api/chalicelib/core/heatmaps.py
@@ -239,9 +239,9 @@ if not config("EXP_SESSIONS_SEARCH", cast=bool, default=False):
                 break
         for f in data.events:
             if f.type == schemas.EventType.LOCATION:
-                location_condition = f.model_copy()
                 if len(f.value) == 0:
                     f.operator = schemas.SearchEventOperator.IS_ANY
+                location_condition = f.model_copy()
             elif f.type == schemas.EventType.CLICK:
                 no_click = False
                 if len(f.value) == 0:
@@ -437,9 +437,9 @@ else:
                 break
         for f in data.events:
             if f.type == schemas.EventType.LOCATION:
-                location_condition = f.model_copy()
                 if len(f.value) == 0:
                     f.operator = schemas.SearchEventOperator.IS_ANY
+                location_condition = f.model_copy()
             elif f.type == schemas.EventType.CLICK:
                 no_click = False
                 if len(f.value) == 0: