diff --git a/pages/dao/[symbol]/proposal/components/instructions/CloseTokenAccount.tsx b/pages/dao/[symbol]/proposal/components/instructions/CloseTokenAccount.tsx
index 0120da7950..1c4d96f8ce 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/CloseTokenAccount.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/CloseTokenAccount.tsx
@@ -232,6 +232,7 @@ const CloseTokenAccount = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -239,6 +240,7 @@ const CloseTokenAccount = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/ConfigureGateway.tsx b/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/ConfigureGateway.tsx
index 0f092de2d0..3b442e3103 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/ConfigureGateway.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/ConfigureGateway.tsx
@@ -143,6 +143,7 @@ const ConfigureGatewayPlugin = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -150,6 +151,7 @@ const ConfigureGatewayPlugin = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/CreateRegistrar.tsx b/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/CreateRegistrar.tsx
index 081968856f..8d5351c29e 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/CreateRegistrar.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/CreateRegistrar.tsx
@@ -196,6 +196,7 @@ const CreateGatewayPluginRegistrar = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -203,6 +204,7 @@ const CreateGatewayPluginRegistrar = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/AddKeyToDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/AddKeyToDID.tsx
index 38592bd690..c264333744 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/Identity/AddKeyToDID.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/Identity/AddKeyToDID.tsx
@@ -121,6 +121,7 @@ const AddKeyToDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -128,6 +129,7 @@ const AddKeyToDID = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/AddServiceToDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/AddServiceToDID.tsx
index fc48aa88ab..89debc340f 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/Identity/AddServiceToDID.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/Identity/AddServiceToDID.tsx
@@ -115,6 +115,7 @@ const AddServiceToDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -122,6 +123,7 @@ const AddServiceToDID = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveKeyFromDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveKeyFromDID.tsx
index 21e45817cc..69dee952d7 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveKeyFromDID.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveKeyFromDID.tsx
@@ -106,6 +106,7 @@ const RemoveKeyFromDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -113,6 +114,7 @@ const RemoveKeyFromDID = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveServiceFromDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveServiceFromDID.tsx
index 766c088554..3278d243b8 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveServiceFromDID.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveServiceFromDID.tsx
@@ -108,6 +108,7 @@ const RemoveServiceFromDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -115,6 +116,7 @@ const RemoveServiceFromDID = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/ConfigureCollection.tsx b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/ConfigureCollection.tsx
index 5752920676..afe77f98a2 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/ConfigureCollection.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/ConfigureCollection.tsx
@@ -170,6 +170,7 @@ const ConfigureNftPluginCollection = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -177,6 +178,7 @@ const ConfigureNftPluginCollection = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateMaxVoterWeightRecord.tsx b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateMaxVoterWeightRecord.tsx
index b622ec1aa2..bdc5ef3373 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateMaxVoterWeightRecord.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateMaxVoterWeightRecord.tsx
@@ -106,6 +106,7 @@ const CreateNftPluginMaxVoterWeightRecord = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -113,6 +114,7 @@ const CreateNftPluginMaxVoterWeightRecord = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateRegistrar.tsx b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateRegistrar.tsx
index cc81c9ec35..433069c94a 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateRegistrar.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateRegistrar.tsx
@@ -114,6 +114,7 @@ const CreateNftPluginRegistrar = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -121,6 +122,7 @@ const CreateNftPluginRegistrar = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/Vsr/CreateRegistrar.tsx b/pages/dao/[symbol]/proposal/components/instructions/Vsr/CreateRegistrar.tsx
index eee4037e8b..1de07e4a17 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/Vsr/CreateRegistrar.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/Vsr/CreateRegistrar.tsx
@@ -128,6 +128,7 @@ const CreateVsrRegistrar = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -135,6 +136,7 @@ const CreateVsrRegistrar = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }
diff --git a/pages/dao/[symbol]/proposal/components/instructions/Vsr/VotingMintConfig.tsx b/pages/dao/[symbol]/proposal/components/instructions/Vsr/VotingMintConfig.tsx
index 03c726fac2..ddccc155b4 100644
--- a/pages/dao/[symbol]/proposal/components/instructions/Vsr/VotingMintConfig.tsx
+++ b/pages/dao/[symbol]/proposal/components/instructions/Vsr/VotingMintConfig.tsx
@@ -270,6 +270,7 @@ const VotingMintConfig = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
@@ -277,6 +278,7 @@ const VotingMintConfig = ({
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }