diff --git a/src/components/organisms/RightSidePanel.tsx b/src/components/organisms/RightSidePanel.tsx
index 51f0d082..59c79476 100644
--- a/src/components/organisms/RightSidePanel.tsx
+++ b/src/components/organisms/RightSidePanel.tsx
@@ -231,7 +231,7 @@ export const RightSidePanel = () => {
                       <Typography>
                       List Selected Successfully
                     </Typography>
-                      {Object.entries(step.fields).map(([key, field]) => (
+                      {Object.keys(step.fields).length > 0 && Object.entries(step.fields).map(([key, field]) => (
                         <React.Fragment key={key}>
                           <TextField
                             label="Field Label"