diff --git a/packages/mermaid/src/diagrams/flowchart/flowDb.ts b/packages/mermaid/src/diagrams/flowchart/flowDb.ts
index 5abebc19f..94c6735c5 100644
--- a/packages/mermaid/src/diagrams/flowchart/flowDb.ts
+++ b/packages/mermaid/src/diagrams/flowchart/flowDb.ts
@@ -814,17 +814,17 @@ export const lex = {
 };
 
 const getTypeFromVertex = (vertex: FlowVertex) => {
-  if (vertex?.img) {
+  if (vertex.img) {
     return 'imageSquare';
   }
-  if (vertex?.icon) {
-    if (vertex?.form === 'circle') {
+  if (vertex.icon) {
+    if (vertex.form === 'circle') {
       return 'iconCircle';
     }
-    if (vertex?.form === 'square') {
+    if (vertex.form === 'square') {
       return 'iconSquare';
     }
-    if (vertex?.form === 'rounded') {
+    if (vertex.form === 'rounded') {
       return 'iconRounded';
     }
     return 'icon';