diff --git a/lib/Listener/FileCreatedFromTemplateListener.php b/lib/Listener/FileCreatedFromTemplateListener.php
index 04d58bb607..731a6d5da5 100644
--- a/lib/Listener/FileCreatedFromTemplateListener.php
+++ b/lib/Listener/FileCreatedFromTemplateListener.php
@@ -52,6 +52,13 @@ public function handle(Event $event): void {
 		// Empty template
 		if ($templateFile === null) {
 			$event->getTarget()->putContent($this->templateManager->getEmptyFileContent($event->getTarget()->getExtension()));
+			$templateType = $this->templateManager->getTemplateTypeForExtension($event->getTarget()->getExtension());
+			$emptyTemplates = $this->templateManager->getEmpty($templateType);
+			$emptyTemplate = array_shift($emptyTemplates);
+			if ($emptyTemplate && $this->templateManager->isSupportedTemplateSource($emptyTemplate->getExtension())) {
+				// Only use TemplateSource if supported filetype
+				$this->templateManager->setTemplateSource($event->getTarget()->getId(), $emptyTemplate->getId());
+			}
 			return;
 		}