diff --git a/app/flask-postgres/app/app.py b/app/flask-postgres/app/app.py
index 7a05808..f280067 100644
--- a/app/flask-postgres/app/app.py
+++ b/app/flask-postgres/app/app.py
@@ -2478,4 +2478,12 @@ def not_found(e):
         "404.html",
         page_title="Seite nicht gefunden",
         **get_current_user()
-    ), 404
\ No newline at end of file
+    ), 404
+
+@app.errorhandler(500)
+def server_error(e):
+    return render_template(
+        "500.html",
+        page_title="Serverfehler",
+        **get_current_user()
+    ), 500
\ No newline at end of file
diff --git a/app/flask-postgres/app/templates/500.html b/app/flask-postgres/app/templates/500.html
new file mode 100644
index 0000000..0e5255f
--- /dev/null
+++ b/app/flask-postgres/app/templates/500.html
@@ -0,0 +1,38 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<div class="error-page">
+
+  <div class="error-card">
+
+    <div class="error-icon">⚠️</div>
+
+    <h1>Serverfehler</h1>
+
+    <p>
+      Es ist ein unerwarteter Fehler aufgetreten.<br>
+      Bitte versuchen Sie es später erneut.
+    </p>
+
+    <div class="error-actions">
+
+    
+
+      {% if is_logged_in %}
+        <a href="/courses" class="btn-secondary">
+          Zu den Kursen
+        </a>
+      {% else %}
+        <a href="/preise" class="btn-secondary">
+          Preise ansehen
+        </a>
+      {% endif %}
+
+    </div>
+
+  </div>
+
+</div>
+
+{% endblock %}
\ No newline at end of file