diff --git a/packages/app/src/components/ErrorBoundary/index.jsx b/packages/app/src/components/ErrorBoundary/index.jsx
new file mode 100644
index 00000000..a07fc465
--- /dev/null
+++ b/packages/app/src/components/ErrorBoundary/index.jsx
@@ -0,0 +1,35 @@
+import React from "react"
+
+class ErrorBoundary extends React.Component {
+	state = {
+		error: null,
+	}
+
+	static getDerivedStateFromError(error) {
+		return { error: error }
+	}
+
+	render() {
+		if (this.state.error) {
+			return (
+				<div
+					style={{
+						display: "flex",
+						flexDirection: "column",
+						backgroundColor: "var(--background-color-accent)",
+						gap: "20px",
+						padding: "10px",
+						borderRadius: "14px",
+					}}
+				>
+					<h3>Render Error</h3>
+					<code>{this.state.error.stack}</code>
+				</div>
+			)
+		}
+
+		return this.props.children
+	}
+}
+
+export default ErrorBoundary