diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc
index b5ed761b5..2e9f8fdb8 100644
--- a/src/www/guiconfig.inc
+++ b/src/www/guiconfig.inc
@@ -41,6 +41,11 @@ if (empty($nocsrf)) {
 		csrf_conf('expires', $timeout_minutes * 60);
 	}
 	require_once('csrf/csrf-magic.php');
+
+        // make sure the session is closed after executing csrf-magic
+        if (session_status() != PHP_SESSION_NONE) {
+            session_write_close();
+        }
 }
 
 function set_language($lang)