diff --git a/Classes/Finisher/Forms/FormsFinisher.php b/Classes/Finisher/Forms/FormsFinisher.php
index d29c69ec94e05626b59e2c6e251f92765c272c5a..da5cb879b5b28ef761aed2f359f0489553b36f57 100644
--- a/Classes/Finisher/Forms/FormsFinisher.php
+++ b/Classes/Finisher/Forms/FormsFinisher.php
@@ -102,7 +102,7 @@ class FormsFinisher extends AbstractFinisher {
 		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
 		/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
 		$mailTemplateService = $objectManager->get(
-			MailTemplateService::class, $templateName, $this->parseOption('extension'), $markers
+			MailTemplateService::class, $templateName, 'sg_mail', $markers
 		);
 
 		$mailTemplateService->setIgnoreMailQueue($ignoreMailQueue);
diff --git a/Configuration/Yaml/Forms/FinisherSetupBE.yaml b/Configuration/Yaml/Forms/FinisherSetupBE.yaml
index e03d9d3101cdb58038a923cf35fe7bc0a260bad6..8ee16689e5aede2e5512d3374acdfd6918efbe9c 100644
--- a/Configuration/Yaml/Forms/FinisherSetupBE.yaml
+++ b/Configuration/Yaml/Forms/FinisherSetupBE.yaml
@@ -11,7 +11,6 @@ TYPO3:
                 label: 'A Label that seems to be never used...'
                 predefinedDefaults:
                   options:
-                    extension: 'sg_mail'
                     template: ''
                     automaticRegistration: true
                     ignoreMailQueue: true
@@ -27,7 +26,6 @@ TYPO3:
                 label: 'A Label that seems to be never used...'
                 predefinedDefaults:
                   options:
-                    extension: 'sg_mail'
                     template: ''
                     automaticRegistration: true
                     ignoreMailQueue: true
@@ -60,11 +58,6 @@ TYPO3:
                           10: 'TYPO3.CMS.Form.mixins.formElementMixins.BaseCollectionEditorsMixin'
                         100:
                           label: "Mail Templates - E-Mail to the website user"
-                        110:
-                          identifier: 'extension'
-                          templateName: 'Inspector-TextEditor'
-                          label: 'Extension key'
-                          propertyPath: 'options.extension'
                         120:
                           identifier: 'template'
                           templateName: 'Inspector-TextEditor'
@@ -124,11 +117,6 @@ TYPO3:
                           10: 'TYPO3.CMS.Form.mixins.formElementMixins.BaseCollectionEditorsMixin'
                         100:
                           label: "Mail Templates - E-Mail to the website admin"
-                        110:
-                          identifier: 'extension'
-                          templateName: 'Inspector-TextEditor'
-                          label: 'Extension key'
-                          propertyPath: 'options.extension'
                         120:
                           identifier: 'template'
                           templateName: 'Inspector-TextEditor'