diff --git a/src/App.php b/src/App.php
index d6532c445c..9cbac155b5 100644
--- a/src/App.php
+++ b/src/App.php
@@ -707,7 +707,9 @@ class App
 			$input     = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
 
 			// Let the module run it's internal process (init, get, post, ...)
+			$timestamp = microtime(true);
 			$response = $module->run($input);
+			$this->profiler->set(microtime(true) - $timestamp, 'content');
 			if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
 				$page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig);
 			} else {
diff --git a/src/App/Page.php b/src/App/Page.php
index 479abfed92..2b8fa26854 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -420,7 +420,6 @@ class Page implements ArrayAccess
 		 */
 		$timestamp = microtime(true);
 		$this->initContent($response, $mode);
-		$profiler->set(microtime(true) - $timestamp, 'content');
 
 		// Load current theme info after module has been initialized as theme could have been set in module
 		$currentTheme = $app->getCurrentTheme();
@@ -448,6 +447,8 @@ class Page implements ArrayAccess
 		 */
 		$this->initFooter($app, $mode, $l10n);
 
+		$profiler->set(microtime(true) - $timestamp, 'aftermath');
+
 		if (!$mode->isAjax()) {
 			Hook::callAll('page_end', $this->page['content']);
 		}