diff --git a/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/WebhookSettings/WebhookSettings.tsx b/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/WebhookSettings/WebhookSettings.tsx
index 2d95591d0..9282bb2af 100644
--- a/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/WebhookSettings/WebhookSettings.tsx
+++ b/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/WebhookSettings/WebhookSettings.tsx
@@ -156,7 +156,7 @@ export const WebhookSettings = ({
           </AccordionButton>
           <AccordionPanel pb={4} as={Stack} spacing="6">
             <CodeEditor
-              value={'test'}
+              value={webhook.body ?? ''}
               lang="json"
               onChange={handleBodyChange}
             />
diff --git a/apps/builder/components/shared/Graph/Nodes/StepNode/StepNodeContent/StepNodeContent.tsx b/apps/builder/components/shared/Graph/Nodes/StepNode/StepNodeContent/StepNodeContent.tsx
index 42a4e894f..14b760dc5 100644
--- a/apps/builder/components/shared/Graph/Nodes/StepNode/StepNodeContent/StepNodeContent.tsx
+++ b/apps/builder/components/shared/Graph/Nodes/StepNode/StepNodeContent/StepNodeContent.tsx
@@ -8,7 +8,7 @@ import {
   IntegrationStepType,
   StepIndices,
 } from 'models'
-import { isInputStep } from 'utils'
+import { isChoiceInput, isInputStep } from 'utils'
 import { ItemNodesList } from '../../ItemNode'
 import {
   SetVariableContent,
@@ -27,7 +27,7 @@ type Props = {
   indices: StepIndices
 }
 export const StepNodeContent = ({ step, indices }: Props) => {
-  if (isInputStep(step) && step.options.variableId) {
+  if (isInputStep(step) && !isChoiceInput(step) && step.options.variableId) {
     return <WithVariableContent step={step} />
   }
   switch (step.type) {