diff --git a/heatmap-tool/frontend/src/App.tsx b/heatmap-tool/frontend/src/App.tsx
index 81824e3a..5a2bcfe4 100644
--- a/heatmap-tool/frontend/src/App.tsx
+++ b/heatmap-tool/frontend/src/App.tsx
@@ -4,6 +4,7 @@ import './App.css';
 import FileUpload from './components/FileUpload';
 import FilterPanel from './components/FilterPanel';
 import MapDisplay from './components/MapDisplay';
+import ErrorBoundary from './components/ErrorBoundary';
 
 // Define types for our state
 export interface FilterOptions {
@@ -52,30 +53,32 @@ function App() {
   };
 
   return (
-    <div className="App">
-      <header className="App-header">
-        <h1>German PLZ Heatmap Tool</h1>
-      </header>
-      <main className="App-main">
-        <div className="control-panel">
-          <FileUpload
-            onUploadSuccess={handleUploadSuccess}
-            setIsLoading={setIsLoading}
-            setError={setError}
-          />
-          <FilterPanel
-            filters={filters}
-            onFilterChange={handleFilterChange}
-            isLoading={isLoading}
-          />
+    <ErrorBoundary>
+        <div className="App">
+        <header className="App-header">
+            <h1>German PLZ Heatmap Tool</h1>
+        </header>
+        <main className="App-main">
+            <div className="control-panel">
+            <FileUpload
+                onUploadSuccess={handleUploadSuccess}
+                setIsLoading={setIsLoading}
+                setError={setError}
+            />
+            <FilterPanel
+                filters={filters}
+                onFilterChange={handleFilterChange}
+                isLoading={isLoading}
+            />
+            </div>
+            <div className="map-container">
+            {isLoading && <p>Loading map data...</p>}
+            {error && <p className="error">{error}</p>}
+            <MapDisplay heatmapData={heatmapData} />
+            </div>
+        </main>
         </div>
-        <div className="map-container">
-          {isLoading && <p>Loading map data...</p>}
-          {error && <p className="error">{error}</p>}
-          <MapDisplay heatmapData={heatmapData} />
-        </div>
-      </main>
-    </div>
+    </ErrorBoundary>
   );
 }