diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 41e597623171a..0ea6a0a1a3b66 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3541,12 +3541,6 @@
     <InvalidReturnType>
       <code><![CDATA[TemplateResponse]]></code>
     </InvalidReturnType>
-    <UndefinedMethod>
-      <code><![CDATA[$template]]></code>
-      <code><![CDATA[$template]]></code>
-      <code><![CDATA[$template]]></code>
-      <code><![CDATA[$template]]></code>
-    </UndefinedMethod>
   </file>
   <file src="lib/private/DirectEditing/Token.php">
     <LessSpecificReturnStatement>
diff --git a/lib/private/DirectEditing/Manager.php b/lib/private/DirectEditing/Manager.php
index c849e4a5cf95a..a73a40b1e19c1 100644
--- a/lib/private/DirectEditing/Manager.php
+++ b/lib/private/DirectEditing/Manager.php
@@ -13,6 +13,7 @@
 use OCP\Constants;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\DirectEditing\ACreateFromTemplate;
+use OCP\DirectEditing\ATemplate;
 use OCP\DirectEditing\IEditor;
 use OCP\DirectEditing\IManager;
 use OCP\DirectEditing\IToken;
@@ -84,6 +85,10 @@ public function getTemplates(string $editor, string $type): array {
 				}
 
 				$templates = array_map(function ($template) use ($creator) {
+					if ($template instanceof ATemplate) {
+						$template = $template->jsonSerialize();
+					}
+
 					$template['extension'] = $creator->getExtension();
 					$template['mimetype'] = $creator->getMimetype();
 					return $template;