diff --git a/web/src/components/Upstream/UpstreamForm.tsx b/web/src/components/Upstream/UpstreamForm.tsx
index 2d41bce96c..b1057afdbb 100644
--- a/web/src/components/Upstream/UpstreamForm.tsx
+++ b/web/src/components/Upstream/UpstreamForm.tsx
@@ -617,7 +617,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
               component: <InActiveHealthCheck />,
             },
           ].map(({ label, name, component }) => (
-            <>
+            <div key={label}>
               <Form.Item label={label} name={name} valuePropName="checked" key={label}>
                 <Switch disabled={readonly} />
               </Form.Item>
@@ -629,7 +629,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
                   return null;
                 }}
               </Form.Item>
-            </>
+            </div>
           ))}
         </PanelSection>
       </Form>
diff --git a/web/src/pages/Route/components/Step1/MatchingRulesView.tsx b/web/src/pages/Route/components/Step1/MatchingRulesView.tsx
index 5f09d17408..9ba0b80161 100644
--- a/web/src/pages/Route/components/Step1/MatchingRulesView.tsx
+++ b/web/src/pages/Route/components/Step1/MatchingRulesView.tsx
@@ -149,7 +149,7 @@ const MatchingRulesView: React.FC<RouteModule.Step1PassProps> = ({
             </Space>
           ),
         },
-  ];
+  ].filter(item => Object.keys(item).length)
 
   const renderModal = () => (
     <Modal