diff --git a/src/add_article.php b/src/add_article.php
index 10dd5c9..6cefe62 100644
--- a/src/add_article.php
+++ b/src/add_article.php
@@ -18,6 +18,10 @@ require_once 'header.php';
 
 $current_user_id = $_SESSION['user_id'];
 $message = '';
+if (isset($_SESSION['add_article_message'])) {
+    $message = $_SESSION['add_article_message'];
+    unset($_SESSION['add_article_message']);
+}
 
 $name = ''; $weight_grams = ''; $category_id = null; $consumable = 0; $image_url = '';
 $product_url = ''; $manufacturer_id = null; $product_designation = '';
@@ -265,8 +269,9 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                     log_household_action($conn, $household_id_for_user, $current_user_id, $log_message);
                 }
                 $message .= '<div class="alert alert-success" role="alert">Artikel "' . htmlspecialchars($name) . '" erfolgreich hinzugefügt! <a href="articles.php" class="alert-link">Zurück zur Übersicht</a>.</div>';
-                $name = $weight_grams = $image_url = $product_url = $product_designation = '';
-                $consumable = 0; $quantity_owned = 1; $category_id = $manufacturer_id = $storage_location_id = $parent_article_id = null;
+                $_SESSION['add_article_message'] = $message;
+                header("Location: add_article.php");
+                exit;
             } else {
                 $message = '<div class="alert alert-danger" role="alert">Fehler beim Hinzufügen des Artikels: ' . $stmt_insert_article->error . '</div>';
             }
diff --git a/src/edit_article.php b/src/edit_article.php
index 84c5a28..964e7c4 100644
--- a/src/edit_article.php
+++ b/src/edit_article.php
@@ -19,6 +19,10 @@ require_once 'header.php';
 
 $current_user_id = $_SESSION['user_id'];
 $message = '';
+if (isset($_SESSION['edit_article_message'])) {
+    $message = $_SESSION['edit_article_message'];
+    unset($_SESSION['edit_article_message']);
+}
 $article_id = isset($_GET['id']) ? intval($_GET['id']) : 0;
 $article_data = null;
 $can_edit = false;
@@ -376,7 +380,9 @@ elseif ($_SERVER["REQUEST_METHOD"] == "POST" && $can_edit) {
                     log_household_action($conn, $household_id_for_user, $current_user_id, $log_message);
                 }
                 $message .= '<div class="alert alert-success" role="alert">Artikel erfolgreich aktualisiert!</div>';
-                echo "<script>setTimeout(() => window.location.href = 'edit_article.php?id=$article_id', 1000);</script>";
+                $_SESSION['edit_article_message'] = $message;
+                header("Location: edit_article.php?id=" . $article_id);
+                exit;
             } else {
                 $message .= '<div class="alert alert-danger" role="alert">Fehler beim Aktualisieren: ' . $stmt_update->error . '</div>';
             }