diff --git a/Classes/Controller/OverviewController.php b/Classes/Controller/OverviewController.php
index 5b002811c71f32d22e80395f42762c173c3515bd..a8e4476ab4f852aa7f2d068561ec84c7b108bb92 100644
--- a/Classes/Controller/OverviewController.php
+++ b/Classes/Controller/OverviewController.php
@@ -118,9 +118,19 @@ class OverviewController extends AbstractController {
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
 	 * @throws \TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException
 	 */
-	public function overviewAction(array $newsFilter = [], int $currentPageBrowserPage = 0) {
+	public function overviewAction(array $newsFilter = [], int $currentPageBrowserPage = 0): ?\Psr\Http\Message\ResponseInterface {
 		if ((int) $this->settings['groupBy'] === 0 && (bool) $this->settings['enableFilter'] === FALSE) {
-			$this->forward('overviewWithoutCategories', NULL, NULL, $this->request->getArguments());
+			if (version_compare(
+				\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<'
+			)) {
+				$this->forward('overviewWithoutCategories', NULL, NULL, $this->request->getArguments());
+			}
+			else {
+				return (new \TYPO3\CMS\Extbase\Http\ForwardResponse(
+					'overviewWithoutCategories'
+					))
+					->withArguments($this->request->getArguments());
+			}
 		}
 
 		// Setup settings
@@ -312,6 +322,12 @@ class OverviewController extends AbstractController {
 			default:
 				$this->view->assign('groupBy', 'none');
 		}
+
+		if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) {
+			return NULL;
+		} else {
+			return $this->htmlResponse();
+		}
 	}
 
 	/**