diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntitySwitch.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntitySwitch.js
index 517360796a..81d2f3d385 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntitySwitch.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntitySwitch.js
@@ -32,7 +32,7 @@ const NodeDefEntitySwitch = (props) => {
 
   const nodeDefName = NodeDef.getName(nodeDef)
   const childUuids = NodeDefLayout.getLayoutChildrenUuids(surveyCycleKey)(nodeDef)
-  const childNames = Survey.getNodeDefsByUuids(childUuids)(survey).map(NodeDef.getName)
+  const childNames = childUuids.map((uuid) => NodeDef.getName(Survey.getNodeDefByUuid(uuid)(survey)))
 
   return (
     <div