diff --git a/src/components/organisms/AssetActions/Compute/index.tsx b/src/components/organisms/AssetActions/Compute/index.tsx
index e055e9233..802c11db5 100644
--- a/src/components/organisms/AssetActions/Compute/index.tsx
+++ b/src/components/organisms/AssetActions/Compute/index.tsx
@@ -197,7 +197,7 @@ export default function Compute({
       setDdoAlgorithmList(gueryResults.results)
       const datasetComputeService = ddo.findServiceByType('compute')
       algorithmSelectionList = await transformDDOToAssetSelection(
-        datasetComputeService.serviceEndpoint,
+        datasetComputeService?.serviceEndpoint,
         gueryResults.results,
         config.metadataCacheUri,
         []
diff --git a/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx b/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx
index b85b52854..91be1264c 100644
--- a/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx
+++ b/src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx
@@ -57,7 +57,9 @@ export default function FormEditComputeDataset({
       config.metadataCacheUri,
       source.token
     )
+    const datasetComputeService = ddo.findServiceByType('compute')
     const algorithmSelectionList = await transformDDOToAssetSelection(
+      datasetComputeService?.serviceEndpoint,
       querryResult.results,
       config.metadataCacheUri,
       publisherTrustedAlgorithms