diff --git a/src/diagrams/common/common.js b/src/diagrams/common/common.js
index 73ccf1cce..39c4c77ca 100644
--- a/src/diagrams/common/common.js
+++ b/src/diagrams/common/common.js
@@ -196,8 +196,8 @@ export const parseGenericTypes = function (text) {
   let cleanedText = text;
 
   if (text.indexOf('~') != -1) {
-    cleanedText = cleanedText.replace('~', '<');
-    cleanedText = cleanedText.replace('~', '>');
+    cleanedText = cleanedText.replace(/~([^~].*)/, '<$1');
+    cleanedText = cleanedText.replace(/~([^~]*)$/, '$1>');
 
     return parseGenericTypes(cleanedText);
   } else {