diff --git a/apps/builder/src/features/preview/components/VariablesDrawer.tsx b/apps/builder/src/features/preview/components/VariablesDrawer.tsx
index 2f7bef1f9..fe19529e0 100644
--- a/apps/builder/src/features/preview/components/VariablesDrawer.tsx
+++ b/apps/builder/src/features/preview/components/VariablesDrawer.tsx
@@ -168,7 +168,8 @@ const VariableItem = ({
       b.type === LogicBlockType.SET_VARIABLE &&
       sessionOnlySetVariableOptions.includes(
         b.options?.type as (typeof sessionOnlySetVariableOptions)[number]
-      )
+      ) &&
+      b.options?.variableId === variable.id
   )
 
   const isLinkedToAnswer = setVariableAndInputBlocks.some(