diff --git a/Classes/Controller/AddressController.php b/Classes/Controller/AddressController.php
index e4d614d4..ce073dbb 100755
--- a/Classes/Controller/AddressController.php
+++ b/Classes/Controller/AddressController.php
@@ -116,6 +116,21 @@ public function injectConfigurationManager(ConfigurationManagerInterface $config
             $originalSettings[$property] = $tsSettings['settings'][$property];
         }
 
+        // Use stdWrap for given defined settings
+        if (isset($originalSettings['useStdWrap']) && !empty($originalSettings['useStdWrap'])) {
+            $typoScriptService = GeneralUtility::makeInstance(TypoScriptService::class);
+            $typoScriptArray = $typoScriptService->convertPlainArrayToTypoScriptArray($originalSettings);
+            $stdWrapProperties = GeneralUtility::trimExplode(',', $originalSettings['useStdWrap'], true);
+            foreach ($stdWrapProperties as $key) {
+                if (is_array($typoScriptArray[$key . '.'])) {
+                    $originalSettings[$key] = $this->configurationManager->getContentObject()->stdWrap(
+                        $typoScriptArray[$key],
+                        $typoScriptArray[$key . '.']
+                    );
+                }
+            }
+        }
+
         // start override
         if (isset($tsSettings['settings']['overrideFlexformSettingsIfEmpty'])) {
             $typoScriptUtility = GeneralUtility::makeInstance(TypoScript::class);