diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 62b5d6ba2..1479efabe 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -334,7 +334,6 @@ class Context
 		}
 
 		ob_start();
-		register_shutdown_function('Context::close');
 
 		// set authentication information in Context and session
 		if(self::isInstalled())
diff --git a/index.php b/index.php
index bb7000fb1..bd0e2d53b 100644
--- a/index.php
+++ b/index.php
@@ -59,5 +59,7 @@ if($oContext->checkSSO())
 	}
 }
 
+Context::close();
+
 /* End of file index.php */
 /* Location: ./index.php */