diff --git a/components/instructions/programs/mangoV4.tsx b/components/instructions/programs/mangoV4.tsx
index d86a9711ea..a6656410bb 100644
--- a/components/instructions/programs/mangoV4.tsx
+++ b/components/instructions/programs/mangoV4.tsx
@@ -256,16 +256,15 @@ const instructions = () => ({
       )[liqudityTier.tier]
       const suggestedUntrusted = liqudityTier.tier === 'UNTRUSTED'
 
-      const suggestedFormattedPreset: ListingArgsFormatted = Object.keys(
-        suggestedPreset
-      ).length
-        ? getFormattedListingValues({
-            tokenIndex: args.tokenIndex,
-            name: args.name,
-            oracle: args.oracle,
-            ...suggestedPreset,
-          })
-        : ({} as ListingArgsFormatted)
+      const suggestedFormattedPreset: ListingArgsFormatted =
+        Object.keys(suggestedPreset).length && !suggestedUntrusted
+          ? getFormattedListingValues({
+              tokenIndex: args.tokenIndex,
+              name: args.name,
+              oracle: args.oracle,
+              ...suggestedPreset,
+            })
+          : ({} as ListingArgsFormatted)
 
       const invalidKeys: (keyof ListingArgsFormatted)[] = Object.keys(
         suggestedPreset
@@ -938,7 +937,8 @@ const instructions = () => ({
                 </h3>
                 <h3 className="text-orange flex">
                   Very low liquidity Price impact of {liqudityTier?.priceImpact}
-                  % on $1000 swap. Check params carefully
+                  % on $1000 swap. Check params carefully token should be listed
+                  with untrusted instruction
                 </h3>
               </>
             )}
@@ -1566,7 +1566,7 @@ const DisplayNullishProperty = ({
           {currentValue}
         </div>
       </div>
-      {<div className="mx-1">/</div>}
+      {currentValue && <div className="mx-1">/</div>}
       <div className="flex">
         <div className="text-orange">{value}</div>
       </div>