diff --git a/src/components/@shared/AssetList/index.tsx b/src/components/@shared/AssetList/index.tsx
index 8b44387f5..4e4a8d80a 100644
--- a/src/components/@shared/AssetList/index.tsx
+++ b/src/components/@shared/AssetList/index.tsx
@@ -35,8 +35,10 @@ const columns: TableOceanColumn<AssetExtended>[] = [
       return (
         <AssetType
           className={styles.typeLabel}
-          type={metadata.additionalInformation.saas ? 'saas' : metadata.type}
-          accessType={metadata.additionalInformation.saas ? 'saas' : accessType}
+          type={metadata?.additionalInformation?.saas ? 'saas' : metadata.type}
+          accessType={
+            metadata?.additionalInformation?.saas ? 'saas' : accessType
+          }
         />
       )
     },
diff --git a/src/components/@shared/AssetTeaser/index.tsx b/src/components/@shared/AssetTeaser/index.tsx
index d533af2d1..38b080069 100644
--- a/src/components/@shared/AssetTeaser/index.tsx
+++ b/src/components/@shared/AssetTeaser/index.tsx
@@ -41,9 +41,9 @@ export default function AssetTeaser({
         <aside className={styles.detailLine}>
           <AssetType
             className={styles.typeLabel}
-            type={asset.metadata.additionalInformation?.saas ? 'saas' : type}
+            type={asset?.metadata?.additionalInformation?.saas ? 'saas' : type}
             accessType={
-              asset.metadata.additionalInformation?.saas ? 'saas' : accessType
+              asset?.metadata?.additionalInformation?.saas ? 'saas' : accessType
             }
           />
           <span className={styles.typeLabel}>
diff --git a/src/components/Asset/Edit/DebugEditMetadata.tsx b/src/components/Asset/Edit/DebugEditMetadata.tsx
index d8444cc4d..635327816 100644
--- a/src/components/Asset/Edit/DebugEditMetadata.tsx
+++ b/src/components/Asset/Edit/DebugEditMetadata.tsx
@@ -21,7 +21,7 @@ export default function DebugEditMetadata({
     values.links[0].valid && [sanitizeUrl(values.links[0].url)]
   const saasDetails =
     values.files[0].type === 'hidden'
-      ? asset.metadata.additionalInformation.saas
+      ? asset?.metadata?.additionalInformation?.saas
       : values.files[0].type === 'saas'
       ? {
           redirectUrl: sanitizeUrl(values.files[0].url),
@@ -46,7 +46,7 @@ export default function DebugEditMetadata({
 
   const showSaas =
     (values.files[0].type === 'hidden' &&
-      asset.metadata.additionalInformation.saas) ||
+      asset?.metadata?.additionalInformation?.saas) ||
     values.files[0].type === 'saas'
   if (!showSaas) delete newMetadata.additionalInformation.saas
 
diff --git a/src/components/Asset/Edit/_constants.ts b/src/components/Asset/Edit/_constants.ts
index d1092bfb9..3de71ee5b 100644
--- a/src/components/Asset/Edit/_constants.ts
+++ b/src/components/Asset/Edit/_constants.ts
@@ -48,7 +48,7 @@ export function getInitialValues(
         ?.termsAndConditions || [{ url: '' }]
     },
     license: metadata?.license,
-    saas: metadata.additionalInformation.saas || {}
+    saas: metadata?.additionalInformation?.saas || {}
   }
 }