diff --git a/src/components/AppNavigation/AppNavigation.vue b/src/components/AppNavigation/AppNavigation.vue
index 841a5b2f..d367263d 100644
--- a/src/components/AppNavigation/AppNavigation.vue
+++ b/src/components/AppNavigation/AppNavigation.vue
@@ -65,7 +65,9 @@
       {{ $t("filter") }}
 
       <div class="app-menu__filter-indicator">
-        {{ spacesStore.numberOfSelectedFilters }}
+        <ClientOnly fallback="...">
+          {{ spacesStore.numberOfSelectedFilters }}
+        </ClientOnly>
 
         <span class="a11y-sr-only">
           {{ $t("filtersSelected") }}
diff --git a/src/components/BuildingHeader/BuildingHeader.vue b/src/components/BuildingHeader/BuildingHeader.vue
index 410355af..fbb42e2f 100644
--- a/src/components/BuildingHeader/BuildingHeader.vue
+++ b/src/components/BuildingHeader/BuildingHeader.vue
@@ -20,11 +20,14 @@
         :opening-hours="building.openingHours"
         class="building-header__open-status"
       />
-      <OpeningHours
-        :opening-hours-building="building.openingHours"
-        :opening-hours-space="building.openingHours"
-        class="building-header__opening-hours"
-      />
+      <ClientOnly>
+        <OpeningHours
+          v-if="building.openingHours"
+          :opening-hours-building="building.openingHours"
+          :opening-hours-space="building.openingHours"
+          class="building-header__opening-hours"
+        />
+      </ClientOnly>
     </div>
   </div>
 </template>
diff --git a/src/lib/filter-spaces.ts b/src/lib/filter-spaces.ts
index f42eaf42..dd5ad18c 100644
--- a/src/lib/filter-spaces.ts
+++ b/src/lib/filter-spaces.ts
@@ -52,7 +52,8 @@ function filterSpace(
 
   return activeFilterKeys.every((activeFilterKey) => {
     if (activeFilterKey == "showOpenLocations")
-      return spaceIsOpen(now, space.building.openingHours);
+      return space.building.openingHours
+        && spaceIsOpen(now, space.building.openingHours);
     if (activeFilterKey == "buildings")
       return filters.buildings.includes(space.buildingNumber);
     if (activeFilterKey == "quietness")