diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.repository.ts
index e4ba53c696..1d8ec27d60 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.repository.ts
@@ -13,23 +13,19 @@ export class UmbRollbackRepository extends UmbControllerBase implements UmbApi {
 	}
 
 	async requestVersionsByDocumentId(id: string, culture?: string) {
-		const { data, error } = await this.#dataSource.getVersionsByDocumentId(id, culture);
-		return { data, error };
+		return await this.#dataSource.getVersionsByDocumentId(id, culture);
 	}
 
 	async requestVersionById(id: string) {
-		const { data, error } = await this.#dataSource.getVersionById(id);
-		return { data, error };
+		return await this.#dataSource.getVersionById(id);
 	}
 
 	async setPreventCleanup(versionId: string, preventCleanup: boolean) {
-		const { error } = await this.#dataSource.setPreventCleanup(versionId, preventCleanup);
-		return { error };
+		return await this.#dataSource.setPreventCleanup(versionId, preventCleanup);
 	}
 
 	async rollback(versionId: string, culture?: string) {
-		const { error } = await this.#dataSource.rollback(versionId, culture);
-		return { error };
+		return await this.#dataSource.rollback(versionId, culture);
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
index 0c73f5cf84..36c6aee92e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
@@ -1,3 +1,4 @@
+import { UMB_ROLLBACK_MODAL } from '../../../modals/rollback/index.js';
 import { HistoryTagStyleAndText, TimeOptions } from './utils.js';
 import { UmbAuditLogRepository } from '@umbraco-cms/backoffice/audit-log';
 import {
@@ -15,15 +16,12 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api';
-import { UMB_MODAL_MANAGER_CONTEXT, type UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
-import { UMB_ROLLBACK_MODAL_ALIAS } from '../../../modals/manifests.js';
-import { UMB_ROLLBACK_MODAL } from '../../../modals/rollback/index.js';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 
 @customElement('umb-document-workspace-view-info-history')
 export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
 	#logRepository: UmbAuditLogRepository;
 	#itemsPerPage = 10;
-	#modalContext?: UmbModalManagerContext;
 
 	@property()
 	documentUnique = '';
@@ -40,9 +38,6 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
 	constructor() {
 		super();
 		this.#logRepository = new UmbAuditLogRepository(this);
-		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
-			this.#modalContext = instance;
-		});
 	}
 
 	protected firstUpdated(): void {
@@ -95,8 +90,9 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
 		this.#getLogs();
 	}
 
-	#onRollbackModalOpen = () => {
-		const modalContext = this.#modalContext?.open(this, UMB_ROLLBACK_MODAL, {});
+	#onRollbackModalOpen = async () => {
+		const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+		const modalContext = modalManagerContext.open(this, UMB_ROLLBACK_MODAL, {});
 
 		if (!modalContext) return;