diff --git a/src/SemanticMW/QueryHandler.php b/src/SemanticMW/QueryHandler.php
index b0415434..40cad634 100644
--- a/src/SemanticMW/QueryHandler.php
+++ b/src/SemanticMW/QueryHandler.php
@@ -468,12 +468,12 @@ private function getTitleOutput( string $titleText ) {
 	}
 
 	private function getParser(): \Parser {
-		$user = \RequestContext::getMain()->getUser();
 		$parser = MediaWikiServices::getInstance()->getParser();
 		if ( !$parser->getOptions() ) {
+			$user = \RequestContext::getMain()->getUser();
 			$parser->setOptions( new \ParserOptions( $user ) );
+			$parser->clearState();
 		}
-		$parser->clearState();
 		return $parser;
 	}