diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 10eb869..822d1af 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -12,6 +12,8 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 180s;
+        proxy_connect_timeout 10s;
     }
 
     location / {
diff --git a/frontend/src/pages/Analytics.jsx b/frontend/src/pages/Analytics.jsx
index 5cb1572..6d2f14e 100644
--- a/frontend/src/pages/Analytics.jsx
+++ b/frontend/src/pages/Analytics.jsx
@@ -95,7 +95,13 @@ export default function Analytics() {
   };
 
   if (loading) return <div className="text-center py-12 text-gray-400">Laden...</div>;
-  if (!overview) return <div className="text-center py-12 text-gray-400">Fehler beim Laden der Analytics-Daten. {error && <span className="text-red-400 block mt-1">{error}</span>}</div>;
+  if (!overview) return (
+    <div className="text-center py-12">
+      <p className="text-gray-500 mb-2">Fehler beim Laden der Analytics-Daten.</p>
+      {error && <p className="text-red-500 text-sm">{error}</p>}
+      <button onClick={load} className="mt-4 px-4 py-2 bg-blue-600 text-white rounded-lg text-sm hover:bg-blue-700">Erneut versuchen</button>
+    </div>
+  );
 
   return (
     <div className="max-w-6xl mx-auto space-y-8">