diff --git a/webapp/components/expression/expressionVariables.js b/webapp/components/expression/expressionVariables.js
index 0da6832f58..fbe7083396 100644
--- a/webapp/components/expression/expressionVariables.js
+++ b/webapp/components/expression/expressionVariables.js
@@ -166,7 +166,7 @@ const getVariablesGroupedByParentUuid = ({
     // sort groups by hierarchy level, in descending order
     .sort((groupA, groupB) => groupB.hierarchyLevel - groupA.hierarchyLevel)
 
-  if (!nodeDefCurrent || excludeCurrentNodeDef || !includeThis) {
+  if (!nodeDefCurrent || excludeCurrentNodeDef || !includeThis || NodeDef.isEntity(nodeDefCurrent)) {
     return groups
   }
   // always show current variable at the beginning