diff --git a/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx b/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
index 3a0261831..9490532fe 100644
--- a/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
+++ b/src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
@@ -78,7 +78,6 @@ export class ElsaWorkflowDesigner {
 
   @Watch('selectedActivityIds')
   handleSelectedActivityIdsChanged(newValue: Array<string>) {
-    debugger;
     const ids = newValue || [];
     const selectedActivities = this.workflowModel.activities.filter(x => ids.includes(x.activityId));
     const map: Map<ActivityModel> = {};
diff --git a/src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-viewer/elsa-workflow-instance-viewer-screen/elsa-workflow-instance-viewer-screen.tsx b/src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-viewer/elsa-workflow-instance-viewer-screen/elsa-workflow-instance-viewer-screen.tsx
index 759137a33..2f24ca679 100644
--- a/src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-viewer/elsa-workflow-instance-viewer-screen/elsa-workflow-instance-viewer-screen.tsx
+++ b/src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-viewer/elsa-workflow-instance-viewer-screen/elsa-workflow-instance-viewer-screen.tsx
@@ -135,7 +135,7 @@ export class ElsaWorkflowInstanceViewerScreen {
     return {
       activityId: source.id,
       description: source.description,
-      displayName: source.displayName,
+      displayName: source.displayName || source.name || source.type,
       name: source.name,
       type: source.type,
       properties: properties,