diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dc9263972..ff55efa4f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ BUG FIXES:
 * Upgrade porter version to v1.0.15 and on error getting porter outputs return dict ([#3744](https://github.com/microsoft/AzureTRE/issues/3744))
 * Fix notifications displaying workspace name rather than actual resource ([#3746](https://github.com/microsoft/AzureTRE/issues/3746))
 * Fix SecuredByRole fails if app roles are not loaded  ([#3752](https://github.com/microsoft/AzureTRE/issues/3752))
+* Fix workspace not loading fails if operation or history roles are not loaded  ([#3755](https://github.com/microsoft/AzureTRE/issues/3755))
+
 
 COMPONENTS:
 
diff --git a/ui/app/package.json b/ui/app/package.json
index 3659d79274..466c5d4535 100644
--- a/ui/app/package.json
+++ b/ui/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tre-ui",
-  "version": "0.5.14",
+  "version": "0.5.15",
   "private": true,
   "dependencies": {
     "@azure/msal-browser": "^2.35.0",
diff --git a/ui/app/src/components/shared/ResourceBody.tsx b/ui/app/src/components/shared/ResourceBody.tsx
index 7041a1f843..28d7d6eecb 100644
--- a/ui/app/src/components/shared/ResourceBody.tsx
+++ b/ui/app/src/components/shared/ResourceBody.tsx
@@ -61,7 +61,7 @@ export const ResourceBody: React.FunctionComponent<ResourceBodyProps> = (props:
         </PivotItem>
       }
       {
-        !props.readonly &&
+        !props.readonly && historyRoles &&
         <PivotItem headerText="History">
           <SecuredByRole allowedAppRoles={historyRoles} allowedWorkspaceRoles={historyRoles} workspaceId={workspaceId} errorString={`Must have ${historyRoles.join(" or ")} role`} element={
             <ResourceHistoryList resource={props.resource} />
@@ -69,7 +69,7 @@ export const ResourceBody: React.FunctionComponent<ResourceBodyProps> = (props:
         </PivotItem>
       }
       {
-        !props.readonly &&
+        !props.readonly && operationsRoles &&
         <PivotItem headerText="Operations">
           <SecuredByRole allowedAppRoles={operationsRoles} allowedWorkspaceRoles={operationsRoles} workspaceId={workspaceId} errorString={`Must have ${operationsRoles.join(" or ")} role`} element={
             <ResourceOperationsList resource={props.resource} />