diff --git a/manage_events/api/views.py b/manage_events/api/views.py
index a1f2dd0..f204ff9 100644
--- a/manage_events/api/views.py
+++ b/manage_events/api/views.py
@@ -617,7 +617,7 @@ class EventFilterByLocationAPIView(APIView):
 
         max_distance_km = 10  # Set your desired maximum distance
         current_and_future_events_query = Q(active=True, deleted=False, draft=False) & (
-            Q(start_date__lte=today, end_date__gte=today) | Q(start_date__gt=today)
+            Q(end_date__gte=today)
         )
 
         # Get the queryset based on the filter conditions
@@ -629,6 +629,8 @@ class EventFilterByLocationAPIView(APIView):
 
         venues_within_range = []
         for venue in venues:
+            if venue.longitude is None or venue.latitude is None:
+                continue  # Skip this venue if longitude or latitude is missing
             distance = haversine_one(
                 user_lon, user_lat, venue.longitude, venue.latitude
             )