diff --git a/app/portainer/views/endpoints/edit/endpoint.html b/app/portainer/views/endpoints/edit/endpoint.html
index 7775d9fdd..959d7d5e2 100644
--- a/app/portainer/views/endpoints/edit/endpoint.html
+++ b/app/portainer/views/endpoints/edit/endpoint.html
@@ -1,4 +1,4 @@
-<page-header title="'Environment details'" breadcrumbs="[{label:'Environments', link:'portainer.endpoints'}, endpoint.Name]" reload="true"> </page-header>
+<page-header ng-if="endpoint" title="'Environment details'" breadcrumbs="[{label:'Environments', link:'portainer.endpoints'}, endpoint.Name]" reload="true"> </page-header>
 
 <div class="row">
   <div ng-if="state.edgeEndpoint">
@@ -224,7 +224,7 @@
           <!-- !open-amt info -->
           <!-- gpus info -->
           <div class="col-sm-12 form-section-title">Hardware acceleration</div>
-          <gpus-list value="endpoint.Gpus || []" on-change="(onGpusChange)"></gpus-list>
+          <gpus-list ng-if="endpoint && endpoint.Gpus" value="endpoint.Gpus" on-change="(onGpusChange)"></gpus-list>
           <!-- gpus info -->
           <div class="form-group">
             <div class="col-sm-12">
diff --git a/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx b/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx
index 0602a9996..f470d08f0 100644
--- a/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx
+++ b/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx
@@ -27,6 +27,10 @@ export function Breadcrumbs({ breadcrumbs }: Props) {
 }
 
 function renderCrumb(crumb: Crumb | string) {
+  if (!crumb) {
+    return '';
+  }
+
   if (typeof crumb === 'string') {
     return crumb;
   }