diff --git a/client/src/api/index.ts b/client/src/api/index.ts
index 4048356ef219..a32e076b84ff 100644
--- a/client/src/api/index.ts
+++ b/client/src/api/index.ts
@@ -7,18 +7,72 @@ import { components } from "@/api/schema";
  */
 export type HistorySummary = components["schemas"]["HistorySummary"];
 
-export interface HistorySummaryExtended extends HistorySummary {
+/**
+ * Contains minimal information about a History with additional content stats.
+ * This is a subset of information that can be relatively frequently updated after
+ * certain actions are performed on the history.
+ */
+export interface HistoryContentsStats {
+    id: string;
+    update_time: string;
     size: number;
     contents_active: components["schemas"]["HistoryActiveContentCounts"];
+}
+
+/**
+ * Contains summary information plus additional details about the contents and owner of a History.
+ * This is used by the client API to simplify the handling of History objects.
+ *
+ * Data returned by the API when requesting `?view=summary&keys=size,contents_active,user_id`.
+ */
+export interface HistorySummaryExtended extends HistorySummary, HistoryContentsStats {
     user_id: string;
 }
 
+type HistoryDetailedModel = components["schemas"]["HistoryDetailed"];
+
 /**
  * Contains additional details about a History.
+ *
+ * Data returned by the API when requesting `?view=detailed`.
+ */
+export interface HistoryDetailed extends HistoryDetailedModel {
+    // TODO: these fields are not present in the backend schema model `HistoryDetailedModel` but are serialized by the API
+    // when requesting ?view=detailed. We should consider adding them to the backend schema.
+    email_hash?: string;
+    empty: boolean;
+    hid_counter: number;
+}
+
+type HistoryDetailedCommon = Omit<
+    HistoryDetailed,
+    "username" | "state" | "state_ids" | "state_details" | "email_hash" | "empty"
+>;
+
+/**
+ * Alternative representation of history details used by the client API.
+ * Shares most of the fields with HistoryDetailed but not all and adds some additional fields.
+ *
+ * Data returned by the API when requesting `?view=dev-detailed`.
  */
-export type HistoryDetailed = components["schemas"]["HistoryDetailed"];
+export interface HistoryDevDetailed extends HistoryDetailedCommon {
+    contents_active: components["schemas"]["HistoryActiveContentCounts"];
+}
 
-export type AnyHistory = HistorySummary | HistorySummaryExtended | HistoryDetailed;
+/**
+ * Contains all available information about a History.
+ */
+export type HistoryExtended = HistoryDevDetailed & HistoryDetailed;
+
+/**
+ * Represents any amount of information about a History with the minimal being a HistorySummary.
+ */
+export type AnyHistory =
+    | HistorySummary
+    | HistorySummaryExtended
+    | HistoryDetailed
+    | HistoryDevDetailed
+    | HistoryExtended;
 
 /**
  * Contains minimal information about a HistoryContentItem.
diff --git a/client/src/components/History/CurrentHistory/HistoryCounter.vue b/client/src/components/History/CurrentHistory/HistoryCounter.vue
index 98efa0bf11b8..ce02cca585b4 100644
--- a/client/src/components/History/CurrentHistory/HistoryCounter.vue
+++ b/client/src/components/History/CurrentHistory/HistoryCounter.vue
@@ -9,14 +9,13 @@ import prettyBytes from "pretty-bytes";
 import { computed, onMounted, ref, toRef } from "vue";
 import { useRouter } from "vue-router/composables";
 
-import type { HistorySummary } from "@/api";
+import type { HistorySummaryExtended } from "@/api";
 import { HistoryFilters } from "@/components/History/HistoryFilters.js";
 import { useConfig } from "@/composables/config";
+import { useHistoryContentStats } from "@/composables/historyContentStats";
 import { useStorageLocationConfiguration } from "@/composables/storageLocation";
 import { useUserStore } from "@/stores/userStore";
 
-import { useDetailedHistory } from "./usesDetailedHistory";
-
 import PreferredStorePopover from "./PreferredStorePopover.vue";
 import SelectPreferredStore from "./SelectPreferredStore.vue";
 
@@ -26,7 +25,7 @@ library.add(faDatabase, faEyeSlash, faHdd, faMapMarker, faSync, faTrash);
 
 const props = withDefaults(
     defineProps<{
-        history: HistorySummary;
+        history: HistorySummaryExtended;
         isWatching?: boolean;
         lastChecked: Date;
         filterText?: string;
@@ -47,7 +46,9 @@ const emit = defineEmits(["update:filter-text", "reloadContents"]);
 const router = useRouter();
 const { config } = useConfig();
 const { currentUser } = storeToRefs(useUserStore());
-const { historySize, numItemsActive, numItemsDeleted, numItemsHidden } = useDetailedHistory(toRef(props, "history"));
+const { historySize, numItemsActive, numItemsDeleted, numItemsHidden } = useHistoryContentStats(
+    toRef(props, "history")
+);
 
 const reloadButtonLoading = ref(false);
 const reloadButtonTitle = ref("");
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/DefaultOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/DefaultOperations.vue
index ad3f94fda94c..07bb357e4c3a 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/DefaultOperations.vue
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/DefaultOperations.vue
@@ -5,26 +5,26 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BDropdown, BDropdownItem, BDropdownText, BModal } from "bootstrap-vue";
 import { toRef } from "vue";
 
-import type { HistorySummary } from "@/api";
-import { useDetailedHistory } from "@/components/History/CurrentHistory/usesDetailedHistory";
+import type { HistorySummary, HistorySummaryExtended } from "@/api";
 import {
     deleteAllHiddenContent,
     purgeAllDeletedContent,
     unhideAllHiddenContent,
 } from "@/components/History/model/crud";
 import { iframeRedirect } from "@/components/plugins/legacyNavigation";
+import { useHistoryContentStats } from "@/composables/historyContentStats";
 
 library.add(faCog);
 
 interface Props {
-    history: HistorySummary;
+    history: HistorySummaryExtended;
 }
 
 const props = defineProps<Props>();
 
 const emit = defineEmits(["update:operation-running"]);
 
-const { numItemsDeleted, numItemsHidden } = useDetailedHistory(toRef(props, "history"));
+const { numItemsDeleted, numItemsHidden } = useHistoryContentStats(toRef(props, "history"));
 
 function onCopy() {
     iframeRedirect("/dataset/copy_datasets");
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/HistoryOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/HistoryOperations.vue
index cddb848018d5..4ae704e4b8fa 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/HistoryOperations.vue
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/HistoryOperations.vue
@@ -3,17 +3,18 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import { faCheckSquare, faCompress } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
-import type { HistorySummary } from "@/api";
+import type { HistorySummaryExtended } from "@/api";
 
 import DefaultOperations from "@/components/History/CurrentHistory/HistoryOperations/DefaultOperations.vue";
 
 library.add(faCheckSquare, faCompress);
 
 interface Props {
-    history: HistorySummary;
+    history: HistorySummaryExtended;
     hasMatches: boolean;
     expandedCount: number;
     showSelection: boolean;
+    isMultiViewItem: boolean;
 }
 
 const props = defineProps<Props>();
@@ -60,6 +61,7 @@ function onUpdateOperationStatus(updateTime: number) {
             </BButtonGroup>
 
             <DefaultOperations
+                v-if="!isMultiViewItem"
                 v-show="!showSelection"
                 :history="history"
                 @update:operation-running="onUpdateOperationStatus" />
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
index 766ef8ac9686..59076e8063af 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
@@ -1,5 +1,5 @@
 <template>
-    <section v-if="hasSelection">
+    <section v-if="hasSelection && !isMultiViewItem">
         <b-dropdown text="Selection" size="sm" variant="primary" data-description="selected content menu" no-flip>
             <template v-slot:button-content>
                 <span v-if="selectionMatchesQuery" data-test-id="all-filter-selected">
@@ -178,6 +178,7 @@ export default {
         contentSelection: { type: Map, required: true },
         selectionSize: { type: Number, required: true },
         isQuerySelection: { type: Boolean, required: true },
+        isMultiViewItem: { type: Boolean, required: true },
         totalItemsInQuery: { type: Number, default: 0 },
     },
     setup() {
diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
index 5e287c961ec2..ad742f154c4d 100644
--- a/client/src/components/History/CurrentHistory/HistoryPanel.vue
+++ b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -3,7 +3,7 @@ import { BAlert } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
 import { computed, onMounted, type Ref, ref, set as VueSet, unref, watch } from "vue";
 
-import type { HistorySummary } from "@/api";
+import type { HistorySummaryExtended } from "@/api";
 import { copyDataset } from "@/api/datasets";
 import ExpandedItems from "@/components/History/Content/ExpandedItems";
 import SelectedItems from "@/components/History/Content/SelectedItems";
@@ -47,7 +47,7 @@ interface BackendFilterError {
 
 interface Props {
     listOffset?: number;
-    history: HistorySummary;
+    history: HistorySummaryExtended;
     filter?: string;
     canEditHistory?: boolean;
     filterable?: boolean;
@@ -294,6 +294,7 @@ async function onDelete(item: HistoryItem, recursive = false) {
 
     try {
         await deleteContent(item, { recursive: recursive });
+        updateContentStats();
     } finally {
         isLoading.value = false;
     }
@@ -315,6 +316,7 @@ async function onUndelete(item: HistoryItem) {
 
     try {
         await updateContentFields(item, { deleted: false });
+        updateContentStats();
     } finally {
         isLoading.value = false;
     }
@@ -326,11 +328,16 @@ async function onUnhide(item: HistoryItem) {
 
     try {
         await updateContentFields(item, { visible: true });
+        updateContentStats();
     } finally {
         isLoading.value = false;
     }
 }
 
+function updateContentStats() {
+    historyStore.updateContentStats(props.history.id);
+}
+
 function reloadContents() {
     startWatchingHistory();
 }
@@ -542,6 +549,7 @@ function setItemDragstart(
                     <HistoryOperations
                         v-if="canEditHistory"
                         :history="history"
+                        :is-multi-view-item="isMultiViewItem"
                         :show-selection="showSelection"
                         :expanded-count="expandedCount"
                         :has-matches="hasMatches(historyItems)"
@@ -551,6 +559,7 @@ function setItemDragstart(
                         <template v-slot:selection-operations>
                             <HistorySelectionOperations
                                 :history="history"
+                                :is-multi-view-item="isMultiViewItem"
                                 :filter-text="filterText"
                                 :content-selection="selectedItems"
                                 :selection-size="selectionSize"
@@ -570,7 +579,7 @@ function setItemDragstart(
                         </template>
                     </HistoryOperations>
 
-                    <SelectionChangeWarning :query-selection-break="querySelectionBreak" />
+                    <SelectionChangeWarning v-if="!isMultiViewItem" :query-selection-break="querySelectionBreak" />
 
                     <OperationErrorDialog
                         v-if="operationError"
diff --git a/client/src/components/History/CurrentHistory/usesDetailedHistory.js b/client/src/components/History/CurrentHistory/usesDetailedHistory.js
deleted file mode 100644
index 78c0c7256756..000000000000
--- a/client/src/components/History/CurrentHistory/usesDetailedHistory.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { computed } from "vue";
-
-export function useDetailedHistory(history) {
-    const historySize = computed(() => history.value.size || 0);
-    const numItemsActive = computed(() => history.value.contents_active?.active || 0);
-    const numItemsDeleted = computed(() => history.value.contents_active?.deleted || 0);
-    const numItemsHidden = computed(() => history.value.contents_active?.hidden || 0);
-
-    return {
-        historySize,
-        numItemsActive,
-        numItemsDeleted,
-        numItemsHidden,
-    };
-}
diff --git a/client/src/components/History/HistoryScrollList.vue b/client/src/components/History/HistoryScrollList.vue
index 8198d3d7ebd4..320fd832d703 100644
--- a/client/src/components/History/HistoryScrollList.vue
+++ b/client/src/components/History/HistoryScrollList.vue
@@ -9,7 +9,7 @@ import { storeToRefs } from "pinia";
 import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import { useRouter } from "vue-router/composables";
 
-import type { HistoryDetailed, HistorySummary } from "@/api";
+import { type AnyHistory, type HistorySummary, userOwnsHistory } from "@/api";
 import { useAnimationFrameResizeObserver } from "@/composables/sensors/animationFrameResizeObserver";
 import { useAnimationFrameScroll } from "@/composables/sensors/animationFrameScroll";
 import { useHistoryStore } from "@/stores/historyStore";
@@ -121,11 +121,9 @@ watch(
 /** `historyStore` histories for current user */
 const historiesProxy = ref<HistorySummary[]>([]);
 watch(
-    () => histories.value as HistoryDetailed[],
-    (h: HistoryDetailed[]) => {
-        historiesProxy.value = h.filter(
-            (h) => !h.user_id || (!currentUser.value?.isAnonymous && h.user_id === currentUser.value?.id)
-        );
+    () => histories.value as AnyHistory[],
+    (h: AnyHistory[]) => {
+        historiesProxy.value = h.filter((h) => userOwnsHistory(currentUser.value, h));
     },
     {
         immediate: true,
diff --git a/client/src/components/History/Multiple/MultipleView.test.js b/client/src/components/History/Multiple/MultipleView.test.js
index 6175c7c69bd1..c8acf9c4fa4e 100644
--- a/client/src/components/History/Multiple/MultipleView.test.js
+++ b/client/src/components/History/Multiple/MultipleView.test.js
@@ -1,7 +1,6 @@
 import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
-import MockUserHistories from "components/providers/MockUserHistories";
 import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
 import { useHistoryStore } from "stores/historyStore";
@@ -24,13 +23,24 @@ const getFakeHistorySummaries = (num, selectedIndex) => {
 const currentUser = { id: USER_ID };
 
 describe("MultipleView", () => {
-    async function setUpWrapper(UserHistoriesMock, count, currentHistoryId) {
-        const axiosMock = new MockAdapter(axios);
-        axiosMock.onGet(`api/histories/${FIRST_HISTORY_ID}`).reply(200, {});
+    let axiosMock;
+
+    beforeEach(() => {
+        axiosMock = new MockAdapter(axios);
+    });
+
+    afterEach(() => {
+        axiosMock.reset();
+    });
+
+    async function setUpWrapper(count, currentHistoryId) {
+        const fakeSummaries = getFakeHistorySummaries(count, 0);
+        for (const summary of fakeSummaries) {
+            axiosMock.onGet(`api/histories/${summary.id}`).reply(200, summary);
+        }
         const wrapper = mount(MultipleView, {
             pinia: createPinia(),
             stubs: {
-                UserHistories: UserHistoriesMock,
                 HistoryPanel: true,
                 icon: { template: "<div></div>" },
             },
@@ -41,12 +51,12 @@ describe("MultipleView", () => {
         userStore.currentUser = currentUser;
 
         const historyStore = useHistoryStore();
-        historyStore.setHistories(getFakeHistorySummaries(count, 0));
+        historyStore.setHistories(fakeSummaries);
         historyStore.setCurrentHistoryId(currentHistoryId);
 
         await flushPromises();
 
-        return { wrapper, axiosMock };
+        return wrapper;
     }
 
     it("more than 4 histories should not show the current history", async () => {
@@ -54,8 +64,9 @@ describe("MultipleView", () => {
         const currentHistoryId = FIRST_HISTORY_ID;
 
         // Set up UserHistories and wrapper
-        const UserHistoriesMock = MockUserHistories({ id: currentHistoryId }, getFakeHistorySummaries(count, 0), false);
-        const { wrapper, axiosMock } = await setUpWrapper(UserHistoriesMock, count, currentHistoryId);
+        const wrapper = await setUpWrapper(count, currentHistoryId);
+
+        console.log(wrapper.html());
 
         // Test: current (first) history should not be shown because only 4 latest are shown by default
         expect(wrapper.find("button[title='Current History']").exists()).toBeFalsy();
@@ -65,21 +76,16 @@ describe("MultipleView", () => {
         expect(wrapper.find("div[title='Currently showing 4 most recently updated histories']").exists()).toBeTruthy();
 
         expect(wrapper.find("[data-description='open select histories modal']").exists()).toBeTruthy();
-
-        axiosMock.reset();
     });
 
-    it("less than or equal to 4 histories should not show the current history", async () => {
+    it("less than 4 histories should show the current history", async () => {
         const count = 3;
         const currentHistoryId = FIRST_HISTORY_ID;
 
         // Set up UserHistories and wrapper
-        const UserHistoriesMock = MockUserHistories({ id: currentHistoryId }, getFakeHistorySummaries(count, 0), false);
-        const { wrapper, axiosMock } = await setUpWrapper(UserHistoriesMock, count, currentHistoryId);
+        const wrapper = await setUpWrapper(count, currentHistoryId);
 
         // Test: current (first) history should be shown because only 4 latest are shown by default, and count = 3
         expect(wrapper.find("button[title='Current History']").exists()).toBeTruthy();
-
-        axiosMock.reset();
     });
 });
diff --git a/client/src/components/History/Multiple/MultipleViewItem.vue b/client/src/components/History/Multiple/MultipleViewItem.vue
index de19d9af530b..a61b7113edf0 100644
--- a/client/src/components/History/Multiple/MultipleViewItem.vue
+++ b/client/src/components/History/Multiple/MultipleViewItem.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { BButton } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
-import { computed, onMounted, ref } from "vue";
+import { computed, ref } from "vue";
 
+import { useExtendedHistory } from "@/composables/detailedHistory";
 import { useHistoryStore } from "@/stores/historyStore";
 
 import CollectionPanel from "@/components/History/CurrentCollection/CollectionPanel.vue";
@@ -21,18 +22,13 @@ const props = defineProps<Props>();
 const historyStore = useHistoryStore();
 const { currentHistoryId, pinnedHistories } = storeToRefs(historyStore);
 
-onMounted(() => {
-    historyStore.loadHistoryById(props.source.id);
-});
+const { history } = useExtendedHistory(props.source.id);
 
 const selectedCollections = ref<any[]>([]);
 
 const sameToCurrent = computed(() => {
     return currentHistoryId.value === props.source.id;
 });
-const getHistory = computed(() => {
-    return historyStore.getHistoryById(props.source.id);
-});
 
 function onViewCollection(collection: object) {
     selectedCollections.value = [...selectedCollections.value, collection];
@@ -40,7 +36,7 @@ function onViewCollection(collection: object) {
 </script>
 
 <template>
-    <div v-if="!getHistory" class="container">
+    <div v-if="!history" class="container">
         <div class="row align-items-center h-100">
             <LoadingSpan class="mx-auto" message="Loading History" />
         </div>
@@ -49,14 +45,14 @@ function onViewCollection(collection: object) {
     <div v-else id="list-item" class="d-flex flex-column align-items-center w-100">
         <CollectionPanel
             v-if="selectedCollections.length && selectedCollections[0]?.history_id === source.id"
-            :history="getHistory"
+            :history="history"
             :selected-collections.sync="selectedCollections"
             :show-controls="false"
             @view-collection="onViewCollection" />
 
         <HistoryPanel
             v-else
-            :history="getHistory"
+            :history="history"
             :filter="filter"
             :show-controls="false"
             is-multi-view-item
diff --git a/client/src/composables/detailedHistory.ts b/client/src/composables/detailedHistory.ts
new file mode 100644
index 000000000000..cd15241aff13
--- /dev/null
+++ b/client/src/composables/detailedHistory.ts
@@ -0,0 +1,32 @@
+/**
+ * This module provides composable functions for working with different types (views) of history objects.
+ * Containing different amounts of required information about a history object depending on the use case.
+ */
+import { computed, onMounted } from "vue";
+
+import { type HistorySummaryExtended } from "@/api";
+import { useHistoryStore } from "@/stores/historyStore";
+
+/**
+ * Provides the extended details for a history.
+ * This composable should be used when the extended details are required.
+ * The extended details usually include the size of the history and the number of active, deleted, and hidden items.
+ * @param historyId The id of the history to get the extended details for.
+ */
+export function useExtendedHistory(historyId: string) {
+    const historyStore = useHistoryStore();
+
+    onMounted(async () => {
+        // Make sure the history is loaded with the extended details
+        // as it may not have been loaded yet or may not have the extended details.
+        await historyStore.loadHistoryById(historyId);
+    });
+
+    const history = computed<HistorySummaryExtended>(
+        () => historyStore.getHistoryById(historyId) as HistorySummaryExtended
+    );
+
+    return {
+        history,
+    };
+}
diff --git a/client/src/composables/historyContentStats.ts b/client/src/composables/historyContentStats.ts
new file mode 100644
index 000000000000..31a12fcc3b7b
--- /dev/null
+++ b/client/src/composables/historyContentStats.ts
@@ -0,0 +1,17 @@
+import { computed, type Ref } from "vue";
+
+import { type HistoryContentsStats } from "@/api";
+
+export function useHistoryContentStats(history: Ref<HistoryContentsStats>) {
+    const historySize = computed(() => history.value?.size ?? 0);
+    const numItemsActive = computed(() => history.value?.contents_active?.active ?? 0);
+    const numItemsDeleted = computed(() => history.value?.contents_active?.deleted ?? 0);
+    const numItemsHidden = computed(() => history.value?.contents_active?.hidden ?? 0);
+
+    return {
+        historySize,
+        numItemsActive,
+        numItemsDeleted,
+        numItemsHidden,
+    };
+}
diff --git a/client/src/store/historyStore/model/watchHistory.js b/client/src/store/historyStore/model/watchHistory.js
index f04ceb582a69..74dfcce033c3 100644
--- a/client/src/store/historyStore/model/watchHistory.js
+++ b/client/src/store/historyStore/model/watchHistory.js
@@ -9,7 +9,6 @@ import { getGalaxyInstance } from "app";
 import { storeToRefs } from "pinia";
 import { useHistoryItemsStore } from "stores/historyItemsStore";
 import { useHistoryStore } from "stores/historyStore";
-import { getCurrentHistoryFromServer } from "stores/services/history.services";
 import { loadSet } from "utils/setCache";
 import { urlData } from "utils/url";
 
@@ -55,7 +54,7 @@ export async function watchHistoryOnce() {
 
     // get current history
     const checkForUpdate = new Date();
-    const history = await getCurrentHistoryFromServer(lastUpdateTime);
+    const history = await historyStore.loadCurrentHistory(lastUpdateTime);
     const { lastCheckedTime } = storeToRefs(historyItemsStore);
     lastCheckedTime.value = checkForUpdate;
     if (!history || !history.id) {
diff --git a/client/src/stores/historyStore.ts b/client/src/stores/historyStore.ts
index 0ceb16cbb053..22279214da3e 100644
--- a/client/src/stores/historyStore.ts
+++ b/client/src/stores/historyStore.ts
@@ -1,7 +1,14 @@
 import { defineStore } from "pinia";
 import { computed, del, ref, set } from "vue";
 
-import type { HistorySummary } from "@/api";
+import type {
+    AnyHistory,
+    HistoryContentsStats,
+    HistoryDevDetailed,
+    HistorySummary,
+    HistorySummaryExtended,
+} from "@/api";
+import { historyFetcher } from "@/api/histories";
 import { archiveHistory, unarchiveHistory } from "@/api/histories.archived";
 import { HistoryFilters } from "@/components/History/HistoryFilters";
 import { useUserLocalStorage } from "@/composables/userLocalStorage";
@@ -21,6 +28,7 @@ import { sortByObjectProp } from "@/utils/sorting";
 
 const PAGINATION_LIMIT = 10;
 const isLoadingHistory = new Set();
+const CONTENT_STATS_KEYS = ["size", "contents_active", "update_time"] as const;
 
 export const useHistoryStore = defineStore("historyStore", () => {
     const historiesLoading = ref(false);
@@ -29,7 +37,7 @@ export const useHistoryStore = defineStore("historyStore", () => {
     const pinnedHistories = useUserLocalStorage<{ id: string }[]>("history-store-pinned-histories", []);
     const storedCurrentHistoryId = ref<string | null>(null);
     const storedFilterTexts = ref<{ [key: string]: string }>({});
-    const storedHistories = ref<{ [key: string]: HistorySummary }>({});
+    const storedHistories = ref<{ [key: string]: AnyHistory }>({});
 
     const histories = computed(() => {
         return Object.values(storedHistories.value)
@@ -41,9 +49,9 @@ export const useHistoryStore = defineStore("historyStore", () => {
         return histories.value[0]?.id ?? null;
     });
 
-    const currentHistory = computed(() => {
+    const currentHistory = computed<HistorySummaryExtended | null>(() => {
         if (storedCurrentHistoryId.value !== null) {
-            return getHistoryById.value(storedCurrentHistoryId.value);
+            return getHistoryById.value(storedCurrentHistoryId.value) as HistorySummaryExtended;
         }
         return null;
     });
@@ -68,6 +76,7 @@ export const useHistoryStore = defineStore("historyStore", () => {
     const getHistoryById = computed(() => {
         return (historyId: string) => {
             if (!storedHistories.value[historyId]) {
+                // TODO: Try to remove this as it can cause computed side effects
                 loadHistoryById(historyId);
             }
             return storedHistories.value[historyId] ?? null;
@@ -86,8 +95,8 @@ export const useHistoryStore = defineStore("historyStore", () => {
     });
 
     async function setCurrentHistory(historyId: string) {
-        const currentHistory = await setCurrentHistoryOnServer(historyId);
-        selectHistory(currentHistory as HistorySummary);
+        const currentHistory = (await setCurrentHistoryOnServer(historyId)) as HistoryDevDetailed;
+        selectHistory(currentHistory);
         setFilterText(historyId, "");
     }
 
@@ -99,16 +108,18 @@ export const useHistoryStore = defineStore("historyStore", () => {
         set(storedFilterTexts.value, historyId, filterText);
     }
 
-    function setHistory(history: HistorySummary) {
+    function setHistory(history: AnyHistory | HistoryContentsStats) {
         if (storedHistories.value[history.id] !== undefined) {
             // Merge the incoming history with existing one to keep additional information
-            Object.assign(storedHistories.value[history.id]!, history);
+            Object.entries(history).forEach(([key, value]) => {
+                set(storedHistories.value[history.id]!, key, value);
+            });
         } else {
             set(storedHistories.value, history.id, history);
         }
     }
 
-    function setHistories(histories: HistorySummary[]) {
+    function setHistories(histories: AnyHistory[]) {
         // The incoming history list may contain less information than the already stored
         // histories, so we ensure that already available details are not getting lost.
         const enrichedHistories = histories.map((history) => {
@@ -117,7 +128,7 @@ export const useHistoryStore = defineStore("historyStore", () => {
         });
         // Histories are provided as list but stored as map.
         const newMap = enrichedHistories.reduce((acc, h) => ({ ...acc, [h.id]: h }), {}) as {
-            [key: string]: HistorySummary;
+            [key: string]: AnyHistory;
         };
         // Ensure that already stored histories, which are not available in the incoming array,
         // are not lost. This happens e.g. with shared histories since they have different owners.
@@ -165,9 +176,9 @@ export const useHistoryStore = defineStore("historyStore", () => {
     }
 
     async function createNewHistory() {
-        const newHistory = await createAndSelectNewHistory();
+        const newHistory = (await createAndSelectNewHistory()) as HistoryDevDetailed;
         await handleTotalCountChange(1);
-        return selectHistory(newHistory as HistorySummary);
+        return selectHistory(newHistory);
     }
 
     function getNextAvailableHistoryId(excludedIds: string[]) {
@@ -189,9 +200,17 @@ export const useHistoryStore = defineStore("historyStore", () => {
         await handleTotalCountChange(1, true);
     }
 
-    async function loadCurrentHistory() {
-        const history = await getCurrentHistoryFromServer();
-        selectHistory(history as HistorySummary);
+    async function loadCurrentHistory(since?: string): Promise<HistoryDevDetailed | undefined> {
+        try {
+            const history = (await getCurrentHistoryFromServer(since)) as HistoryDevDetailed;
+            if (!history) {
+                return; // There are no changes to the current history, nothing to set
+            }
+            selectHistory(history);
+            return history;
+        } catch (error) {
+            console.error(error);
+        }
     }
 
     /**
@@ -207,7 +226,7 @@ export const useHistoryStore = defineStore("historyStore", () => {
     }
 
     async function loadTotalHistoryCount() {
-        await getHistoryCount().then((count) => (totalHistoryCount.value = count));
+        totalHistoryCount.value = await getHistoryCount();
     }
 
     /** TODO:
@@ -231,24 +250,27 @@ export const useHistoryStore = defineStore("historyStore", () => {
                 }
             }
             const offset = queryString ? 0 : historiesOffset.value;
-            await getHistoryList(offset, limit, queryString)
-                .then(async (histories) => {
-                    setHistories(histories);
-                    if (paginate && !queryString && historiesOffset.value == offset) {
-                        await handleTotalCountChange(histories.length);
-                    }
-                })
-                .catch((error) => console.warn(error))
-                .finally(() => setHistoriesLoading(false));
+            try {
+                const histories = (await getHistoryList(offset, limit, queryString)) as HistorySummary[];
+                setHistories(histories);
+                if (paginate && !queryString && historiesOffset.value == offset) {
+                    await handleTotalCountChange(histories.length);
+                }
+            } catch (error) {
+                console.error(error);
+            } finally {
+                setHistoriesLoading(false);
+            }
         }
     }
 
-    async function loadHistoryById(historyId: string) {
+    async function loadHistoryById(historyId: string): Promise<HistorySummaryExtended | undefined> {
         if (!isLoadingHistory.has(historyId)) {
             isLoadingHistory.add(historyId);
             try {
-                const history = await getHistoryByIdFromServer(historyId);
-                setHistory(history as HistorySummary);
+                const history = (await getHistoryByIdFromServer(historyId)) as HistorySummaryExtended;
+                setHistory(history);
+                return history;
             } catch (error) {
                 console.error(error);
             } finally {
@@ -258,13 +280,13 @@ export const useHistoryStore = defineStore("historyStore", () => {
     }
 
     async function secureHistory(history: HistorySummary) {
-        const securedHistory = await secureHistoryOnServer(history);
-        setHistory(securedHistory as HistorySummary);
+        const securedHistory = (await secureHistoryOnServer(history)) as HistorySummaryExtended;
+        setHistory(securedHistory);
     }
 
     async function archiveHistoryById(historyId: string, archiveExportId?: string, purgeHistory = false) {
         const history = await archiveHistory(historyId, archiveExportId, purgeHistory);
-        setHistory(history as HistorySummary);
+        setHistory(history);
         if (!history.archived) {
             return;
         }
@@ -280,13 +302,27 @@ export const useHistoryStore = defineStore("historyStore", () => {
 
     async function unarchiveHistoryById(historyId: string, force?: boolean) {
         const history = await unarchiveHistory(historyId, force);
-        setHistory(history as HistorySummary);
+        setHistory(history);
         return history;
     }
 
     async function updateHistory({ id, ...update }: HistorySummary) {
-        const savedHistory = await updateHistoryFields(id, update);
-        setHistory(savedHistory as HistorySummary);
+        const savedHistory = (await updateHistoryFields(id, update)) as HistorySummaryExtended;
+        setHistory(savedHistory);
+    }
+
+    async function updateContentStats(historyId: string) {
+        try {
+            const { data } = await historyFetcher({
+                history_id: historyId,
+                keys: CONTENT_STATS_KEYS.join(","),
+            });
+            const contentStats = { id: historyId, ...data } as HistoryContentsStats;
+            setHistory(contentStats);
+            return contentStats;
+        } catch (error) {
+            console.error(error);
+        }
     }
 
     return {
@@ -319,5 +355,6 @@ export const useHistoryStore = defineStore("historyStore", () => {
         historiesLoading,
         historiesOffset,
         totalHistoryCount,
+        updateContentStats,
     };
 });
diff --git a/client/src/stores/userStore.ts b/client/src/stores/userStore.ts
index 26783f6609fc..10b9fdf11fcd 100644
--- a/client/src/stores/userStore.ts
+++ b/client/src/stores/userStore.ts
@@ -67,7 +67,6 @@ export const useUserStore = defineStore("userStore", () => {
                     }
                     if (includeHistories) {
                         const historyStore = useHistoryStore();
-                        await historyStore.loadCurrentHistory();
                         // load first few histories for user to start pagination
                         await historyStore.loadHistories();
                     }