diff --git a/aas-web-ui/src/components/AASTreeview.vue b/aas-web-ui/src/components/AASTreeview.vue
index 321a3ef..9197832 100644
--- a/aas-web-ui/src/components/AASTreeview.vue
+++ b/aas-web-ui/src/components/AASTreeview.vue
@@ -253,7 +253,7 @@
                                     } else {
                                         let submodel = {
                                             id: submodelId,
-                                            idShort: submodelId.split('/').pop(),
+                                            idShort: 'Submodel not found',
                                             modelType: 'Submodel',
                                             semanticId: null,
                                             description: [],
@@ -275,7 +275,7 @@
                             } else {
                                 let submodel = {
                                     id: submodelId,
-                                    idShort: submodelId.split('/').pop(),
+                                    idShort: 'Submodel not found',
                                     modelType: 'Submodel',
                                     semanticId: null,
                                     description: [],
diff --git a/aas-web-ui/src/components/SubmodelList.vue b/aas-web-ui/src/components/SubmodelList.vue
index 65ba54f..ef069c0 100644
--- a/aas-web-ui/src/components/SubmodelList.vue
+++ b/aas-web-ui/src/components/SubmodelList.vue
@@ -261,7 +261,7 @@
                                     } else {
                                         let submodel = {
                                             id: submodelId,
-                                            idShort: submodelId.split('/').pop(),
+                                            idShort: 'Submodel not found',
                                             modelType: 'Submodel',
                                             semanticId: null,
                                             description: [],
@@ -283,7 +283,7 @@
                             } else {
                                 let submodel = {
                                     id: submodelId,
-                                    idShort: submodelId.split('/').pop(),
+                                    idShort: 'Submodel not found',
                                     modelType: 'Submodel',
                                     semanticId: null,
                                     description: [],