diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
index 61a70c145bd11..a6c3fdae71b2e 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
@@ -63,13 +63,14 @@ export default function FormByEntity({ formUrn }: Props) {
             <ContentWrapper>
                 <ProgressBar formUrn={formUrn} />
                 <FlexWrapper>
-                    <ProfileSidebar
-                        sidebarSections={loading ? [] : sections}
-                        topSection={{ component: () => <EntityInfo formUrn={formUrn} /> }}
-                        backgroundColor="white"
-                        alignLeft
-                    />
                     <Form formUrn={formUrn} />
+                    {selectedEntityData && (
+                        <ProfileSidebar
+                            sidebarSections={loading ? [] : sections}
+                            topSection={{ component: () => <EntityInfo formUrn={formUrn} /> }}
+                            backgroundColor="white"
+                        />
+                    )}
                 </FlexWrapper>
             </ContentWrapper>
         </EntityContext.Provider>