diff --git a/Classes/Controller/SingleViewController.php b/Classes/Controller/SingleViewController.php
index 7d82e257d2411bf614e601e0772f29353326d8f8..e7e9e8eeb5bcbe0facbe2a8e8c573374b4880ec8 100644
--- a/Classes/Controller/SingleViewController.php
+++ b/Classes/Controller/SingleViewController.php
@@ -65,18 +65,28 @@ class SingleViewController extends AbstractController {
 	 * @return void
 	 * @throws \InvalidArgumentException
 	 */
-	public function singleViewAction() {
+	public function singleViewAction(): ?\Psr\Http\Message\ResponseInterface {
 		/** @var News $news */
 		$currentId = (int) $GLOBALS['TSFE']->id;
 		$news = $this->newsRepository->findByUid($currentId);
 		if (!$news) {
-			return;
+			if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) {
+				return NULL;
+			}
+			else {
+				return $this->htmlResponse();
+			}
 		}
 
 		/** @var Category $newsCategory */
 		$newsCategory = $this->categoryRepository->findByUid($news->getPid());
 		if (!$newsCategory) {
-			return;
+			if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) {
+				return NULL;
+			}
+			else {
+				return $this->htmlResponse();
+			}
 		}
 
 		$newsMetaData = $this->getMetaDataForNews($news, $newsCategory);
@@ -102,6 +112,12 @@ class SingleViewController extends AbstractController {
 				'newsAuthor' => $news->getNewsAuthor(),
 			]
 		);
+		if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) {
+			return NULL;
+		}
+		else {
+			return $this->htmlResponse();
+		}
 	}
 
 	/**