diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
index 2fb008ce43b7538ff692f141516ed70e299e0307..21bba2e4228d36620955e1f906211aa0894e8834 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
@@ -81,6 +81,17 @@ const CustomSwitch = ({ node, getPos }) => {
     main.dispatch(tr);
   };
 
+  const getUpdatedNode = () => {
+    let nodeFound = node;
+    const allNodes = getNodes(main);
+    allNodes.forEach(singNode => {
+      if (singNode.node.attrs.id === node.attrs.id) {
+        nodeFound = singNode;
+      }
+    });
+    return nodeFound;
+  };
+
   return (
     <YesNoSwitch
       checked={checked}
@@ -88,7 +99,7 @@ const CustomSwitch = ({ node, getPos }) => {
       customProps={customProps}
       handleChange={handleChange}
       isEditable={isEditable}
-      node={node}
+      node={getUpdatedNode()}
     />
   );
 };
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js
index 5fdd636b329035a9e165d420d90fd2cf23c5101e..11c01044982a0c162e6918f975fb7d327bdebab8 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js
@@ -46,6 +46,17 @@ const CustomSwitch = ({ node, getPos }) => {
     });
   };
 
+  const getUpdatedNode = () => {
+    let nodeFound = node;
+    const allNodes = getNodes(main);
+    allNodes.forEach(singNode => {
+      if (singNode.node.attrs.id === node.attrs.id) {
+        nodeFound = singNode;
+      }
+    });
+    return nodeFound;
+  };
+
   return (
     <TrueFalseSwitch
       checked={checked}
@@ -53,7 +64,7 @@ const CustomSwitch = ({ node, getPos }) => {
       customProps={customProps}
       handleChange={handleChange}
       isEditable={isEditable}
-      node={node}
+      node={getUpdatedNode()}
     />
   );
 };
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js
index f7b7dedf7d665de75af32aea686b2f4bf5c39d4d..1f2865672a3b823fda7355e96cce5998881e6847 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js
@@ -61,7 +61,7 @@ const StyledIconWrong = styled(Icon)`
 
 const TrueFalseSwitch = ({
   customProps,
-  node,
+  node: { node },
   isEditable,
   handleChange,
   checked,
diff --git a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
index 73aeb1ac79295b4482d873c4527e25007f3ceb45..ee8c6c6085ec0c8364dee3829548b83fcb42dd9d 100644
--- a/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
+++ b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
@@ -81,6 +81,17 @@ const CustomSwitch = ({ node, getPos }) => {
     main.dispatch(tr);
   };
 
+  const getUpdatedNode = () => {
+    let nodeFound = node;
+    const allNodes = getNodes(main);
+    allNodes.forEach(singNode => {
+      if (singNode.node.attrs.id === node.attrs.id) {
+        nodeFound = singNode;
+      }
+    });
+    return nodeFound;
+  };
+
   return (
     <TrueFalseSwitch
       checked={checked}
@@ -88,7 +99,7 @@ const CustomSwitch = ({ node, getPos }) => {
       customProps={customProps}
       handleChange={handleChange}
       isEditable={isEditable}
-      node={node}
+      node={getUpdatedNode()}
     />
   );
 };