diff --git a/src/graph/graph-node.ts b/src/graph/graph-node.ts
index a6ef1ee..d094747 100644
--- a/src/graph/graph-node.ts
+++ b/src/graph/graph-node.ts
@@ -128,9 +128,9 @@ export class GraphNode {
 
         return `
             <g tabindex="-1" class="node ${nodeTypeClass} ${typeClass} ${itemsClass}"
-               data-connection-id="${dataModel.connectionId}"
+               data-connection-id="${HtmlUtils.escapeHTML(dataModel.connectionId)}"
                transform="matrix(1, 0, 0, 1, ${x}, ${y})"
-               data-id="${dataModel.id}">
+               data-id="${HtmlUtils.escapeHTML(dataModel.id)}">
                
                 <g class="core" transform="matrix(1, 0, 0, 1, 0, 0)">
                     <circle cx="0" cy="0" r="${radius}" class="outer"></circle>
@@ -217,4 +217,4 @@ export class GraphNode {
         return model;
     }
 
-}
\ No newline at end of file
+}