diff --git a/lib/xhprof/readme_moodle.txt b/lib/xhprof/readme_moodle.txt
index 8578a8e2d96..b227f0598d2 100644
--- a/lib/xhprof/readme_moodle.txt
+++ b/lib/xhprof/readme_moodle.txt
@@ -21,9 +21,6 @@ Our changes:  Look for "moodle" in code (commit #3 - always mimic from current m
  * xhprof_lib/utils/callgraph_utils.php: Modified to use $CFG->pathtodot
 
 TODO:
- * with the 3 reports (index, callgraph and typeahead), close seesion asap,
-       so user can continue working with moodle while the report (specially
-       the graph is being generated).
  * improvements to the listing mode: various commodity details like:
        - allow to filter by various criteria
        - inline (and ajax) editing of reference/comment and deleting
diff --git a/lib/xhprof/xhprof_html/callgraph.php b/lib/xhprof/xhprof_html/callgraph.php
index a315dbcefdf..308c8bce95c 100644
--- a/lib/xhprof/xhprof_html/callgraph.php
+++ b/lib/xhprof/xhprof_html/callgraph.php
@@ -34,6 +34,7 @@ require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/config.php');
 require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');
 require_login();
 require_capability('moodle/site:config', context_system::instance());
+\core\session\manager::write_close();
 // End moodle modification.
 
 // by default assume that xhprof_html & xhprof_lib directories
diff --git a/lib/xhprof/xhprof_html/index.php b/lib/xhprof/xhprof_html/index.php
index 4748424500e..75bef73a478 100644
--- a/lib/xhprof/xhprof_html/index.php
+++ b/lib/xhprof/xhprof_html/index.php
@@ -36,6 +36,7 @@ require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/config.php');
 require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');
 require_login();
 require_capability('moodle/site:config', context_system::instance());
+\core\session\manager::write_close();
 // End moodle modification.
 
 // by default assume that xhprof_html & xhprof_lib directories
diff --git a/lib/xhprof/xhprof_html/typeahead.php b/lib/xhprof/xhprof_html/typeahead.php
index 0cebba7b9fe..4b5a0273a1d 100644
--- a/lib/xhprof/xhprof_html/typeahead.php
+++ b/lib/xhprof/xhprof_html/typeahead.php
@@ -26,6 +26,7 @@ require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/config.php');
 require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');
 require_login();
 require_capability('moodle/site:config', context_system::instance());
+\core\session\manager::write_close();
 // End moodle modification.
 
 // by default assume that xhprof_html & xhprof_lib directories