diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 7141a5694f457..6eb2eca1b5f03 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3652,12 +3652,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 a362e0a0e182b..721f2319c6462 100644
--- a/lib/private/DirectEditing/Manager.php
+++ b/lib/private/DirectEditing/Manager.php
@@ -14,6 +14,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;
@@ -88,6 +89,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;