diff --git a/Classes/Domain/Model/HtmlMarkup.php b/Classes/Domain/Model/HtmlMarkup.php
index cecb4efe7..2070de0b4 100644
--- a/Classes/Domain/Model/HtmlMarkup.php
+++ b/Classes/Domain/Model/HtmlMarkup.php
@@ -947,7 +947,11 @@ public function setHeaderBodyParts(
 
             // Body tag:
             if ($MappingInfo_head['addBodyTag'] && $BodyTag_cached) {
-                $GLOBALS['TSFE']->defaultBodyTag = $BodyTag_cached;
+                if (version_compare(TYPO3_version, '8.3.0', '>=')) {
+                    $GLOBALS['TSFE']->pSetup['bodyTag'] = $BodyTag_cached;
+                } else {
+                    $GLOBALS['TSFE']->defaultBodyTag = $BodyTag_cached;
+                }
             }
         }
     }