diff --git a/typo3/sysext/form/Classes/Domain/Model/Configuration.php b/typo3/sysext/form/Classes/Domain/Model/Configuration.php
index f745a4e1c6b65dacbbcae3876a531c2fd46725e1..3789bfa8383c6d55024fbf04c754f26238a2ef4f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Configuration.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Configuration.php
@@ -184,6 +184,8 @@ class Configuration {
 		// Set the theme name
 		if (!empty($this->typoScript['themeName'])) {
 			$this->setThemeName($this->typoScript['themeName']);
+		} elseif (!empty($this->typoScriptRepository->getModelConfigurationByScope('FORM', 'themeName'))) {
+			$this->setThemeName($this->typoScriptRepository->getModelConfigurationByScope('FORM', 'themeName'));
 		} else {
 			$this->setThemeName(static::DEFAULT_THEME_NAME);
 		}