diff --git a/src/components/SpotPicker.tsx b/src/components/SpotPicker.tsx
index c24b6ed..939149e 100644
--- a/src/components/SpotPicker.tsx
+++ b/src/components/SpotPicker.tsx
@@ -23,7 +23,7 @@ export function SpotPicker({
   label = 'Spots Where You\'re Available',
   description = 'Select spots where you offer your services',
 }: SpotPickerProps) {
-  const { data: allSpots } = useSkateSpots(100);
+  const { data: allSpots, isLoading: spotsLoading } = useSkateSpots(100);
   const [searchQuery, setSearchQuery] = useState('');
   const [isExpanded, setIsExpanded] = useState(false);
 
@@ -176,11 +176,15 @@ export function SpotPicker({
                       </button>
                     );
                   })}
-                  {filteredSpots.length === 0 && (
+                  {spotsLoading ? (
+                    <p className="text-sm text-gray-500 text-center py-4">
+                      Loading spots…
+                    </p>
+                  ) : filteredSpots.length === 0 ? (
                     <p className="text-sm text-gray-400 text-center py-4">
                       No spots found. Try a different search.
                     </p>
-                  )}
+                  ) : null}
                 </div>
               </CardContent>
             </Card>
diff --git a/src/pages/EventsPage.tsx b/src/pages/EventsPage.tsx
index 3027b04..1969db5 100644
--- a/src/pages/EventsPage.tsx
+++ b/src/pages/EventsPage.tsx
@@ -1157,7 +1157,13 @@ export default function EventsPage() {
                   <button
                     key={key}
                     type="button"
-                    onClick={() => setLayout(key)}
+                    onClick={() => {
+                      setLayout(key);
+                      // The date-window chips only render in list view, so a
+                      // window chosen there would silently keep filtering the
+                      // calendar with no way to see or clear it.
+                      if (key === 'calendar') setDateWindow('all');
+                    }}
                     aria-pressed={active}
                     className={cn(
                       'flex items-center gap-1.5 rounded-full px-3 py-1.5 text-[11px] font-bold uppercase tracking-wide transition-all active:scale-95',