diff --git a/packages/core/client/src/schema-component/antd/error-fallback/ErrorFallback2.tsx b/packages/core/client/src/schema-component/antd/error-fallback/ErrorFallback2.tsx
new file mode 100644
index 000000000..56b32accc
--- /dev/null
+++ b/packages/core/client/src/schema-component/antd/error-fallback/ErrorFallback2.tsx
@@ -0,0 +1,50 @@
+import { Button, Result, Typography } from 'antd';
+import React, { FC } from 'react';
+import { FallbackProps, useErrorBoundary } from 'react-error-boundary';
+import { Trans, useTranslation } from 'react-i18next';
+
+const { Paragraph, Text, Link } = Typography;
+
+export const ErrorFallback: FC<FallbackProps> = ({ error }) => {
+  const { resetBoundary } = useErrorBoundary();
+  const { t } = useTranslation();
+
+  const subTitle = (
+    <Trans>
+      {'This is likely a TachyCode internals bug. Please open an issue at '}
+      <Link href="https://git.daoyoucloud.com/daoyoucloud/tachycode/issues" target="_blank">
+        here
+      </Link>
+    </Trans>
+  );
+
+  return (
+    <div style={{ backgroundColor: 'white' }}>
+      <Result
+        style={{ maxWidth: '60vw', margin: 'auto' }}
+        status="error"
+        title={t('Render Failed')}
+        subTitle={subTitle}
+        extra={[
+          <Button
+            type="primary"
+            key="feedback"
+            href="https://git.daoyoucloud.com/daoyoucloud/tachycode/issues"
+            target="_blank"
+          >
+            {t('Feedback')}
+          </Button>,
+          <Button key="try" onClick={resetBoundary}>
+            {t('Try again')}
+          </Button>,
+        ]}
+      >
+        <Paragraph copyable>
+          <Text type="danger" style={{ whiteSpace: 'pre-line', textAlign: 'center' }}>
+            {error.stack}
+          </Text>
+        </Paragraph>
+      </Result>
+    </div>
+  );
+};
diff --git a/packages/core/client/src/schema-component/antd/error-fallback/index.ts b/packages/core/client/src/schema-component/antd/error-fallback/index.ts
index 12bb8db1b..e7f61b61a 100644
--- a/packages/core/client/src/schema-component/antd/error-fallback/index.ts
+++ b/packages/core/client/src/schema-component/antd/error-fallback/index.ts
@@ -1 +1 @@
-export * from './ErrorFallback';
+export * from './ErrorFallback2';