diff --git a/src/components/timeline/Timeline.svelte b/src/components/timeline/Timeline.svelte
index 533721383c..935371a825 100644
--- a/src/components/timeline/Timeline.svelte
+++ b/src/components/timeline/Timeline.svelte
@@ -386,11 +386,13 @@
 
 <div bind:this={timelineDiv} bind:clientWidth class="timeline" id={`timeline-${timeline?.id}`}>
   <div bind:this={timelineHistogramDiv} class="timeline-time-row">
-    <TimelineTimeDisplay
-      planEndTimeDoy={plan?.end_time_doy}
-      planStartTimeDoy={plan?.start_time_doy}
-      width={timeline?.marginLeft}
-    />
+    {#if plan}
+      <TimelineTimeDisplay
+        planEndTimeDoy={plan?.end_time_doy}
+        planStartTimeDoy={plan?.start_time_doy}
+        width={timeline?.marginLeft}
+      />
+    {/if}
     <div class="timeline-histogram-container">
       <TimelineHistogram
         activityDirectives={timeline && activityDirectivesByView?.byTimelineId[timeline.id]
diff --git a/src/routes/plans/[id]/+page.svelte b/src/routes/plans/[id]/+page.svelte
index 3dddfb149a..e02416b160 100644
--- a/src/routes/plans/[id]/+page.svelte
+++ b/src/routes/plans/[id]/+page.svelte
@@ -1,6 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
+  import { browser } from '$app/environment';
   import { goto } from '$app/navigation';
   import { base } from '$app/paths';
   import { page } from '$app/stores';
@@ -267,12 +268,6 @@
 
     activityTypes.updateValue(() => data.initialActivityTypes);
     planTags.updateValue(() => data.initialPlanTags);
-
-    // Asynchronously fetch resource types
-    effects.getResourceTypes($plan.model_id, data.user).then(initialResourceTypes => {
-      $resourceTypes = initialResourceTypes;
-      $resourceTypesLoading = false;
-    });
   }
   $: if (data.initialPlanSnapshotId !== null) {
     $planSnapshotId = data.initialPlanSnapshotId;
@@ -391,6 +386,14 @@
     response => response.errors?.length,
   ).length;
 
+  $: if ($plan && browser) {
+    // Asynchronously fetch resource types
+    effects.getResourceTypes($plan.model_id, data.user).then(initialResourceTypes => {
+      $resourceTypes = initialResourceTypes;
+      $resourceTypesLoading = false;
+    });
+  }
+
   onDestroy(() => {
     resetActivityStores();
     resetConstraintStores();
diff --git a/src/stores/activities.ts b/src/stores/activities.ts
index 458e17b5e1..0667084802 100644
--- a/src/stores/activities.ts
+++ b/src/stores/activities.ts
@@ -153,4 +153,8 @@ export function resetActivityStores() {
   activityMetadataDefinitions.updateValue(() => []);
   activityDirectivesMap.set({});
   selectedActivityDirectiveId.set(null);
+  activityDirectives.updateValue(() => []);
+  anchorValidationStatuses.updateValue(() => []);
+  activityMetadataDefinitions.updateValue(() => []);
+  activityDirectiveValidationStatuses.updateValue(() => []);
 }