diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
index 1ac7d8800fa5f..8ee5682aa1ba4 100644
--- a/libraries/src/Application/CMSApplication.php
+++ b/libraries/src/Application/CMSApplication.php
@@ -63,14 +63,6 @@ class CMSApplication extends WebApplication
 	 */
 	protected $_messageQueue = array();
 
-	/**
-	 * The session metadata manager
-	 *
-	 * @var    MetadataManager
-	 * @since  3.8.6
-	 */
-	protected $metadataManager = null;
-
 	/**
 	 * The name of the application.
 	 *
@@ -115,8 +107,6 @@ public function __construct(Input $input = null, Registry $config = null, \JAppl
 	{
 		parent::__construct($input, $config, $client);
 
-		$this->metadataManager = new MetadataManager($this, \JFactory::getDbo());
-
 		// Load and set the dispatcher
 		$this->loadDispatcher();
 
@@ -158,7 +148,8 @@ public function __construct(Input $input = null, Registry $config = null, \JAppl
 	 */
 	public function checkSession()
 	{
-		$this->metadataManager->createRecordIfNonExisting(\JFactory::getSession(), \JFactory::getUser());
+		$metadataManager = new MetadataManager($this, \JFactory::getDbo());
+		$metadataManager->createRecordIfNonExisting(\JFactory::getSession(), \JFactory::getUser());
 	}
 
 	/**