diff --git a/psalm.xml b/psalm.xml
index 2810718c0ab..d4a337ffcc8 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -17,6 +17,10 @@
 		</ignoreFiles>
 	</projectFiles>
 	<issueHandlers>
+		<LessSpecificReturnStatement errorLevel="error"/>
+		<LessSpecificReturnType errorLevel="error"/>
+		<LessSpecificImplementedReturnType errorLevel="error"/>
+		<MoreSpecificReturnType errorLevel="error"/>
 		<UndefinedClass>
 			<errorLevel type="suppress">
 				<referencedClass name="Doctrine\DBAL\Exception" />
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index a0de5f1c1a3..fbea3a8da01 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.11.0@c9b192ab8400fdaf04b2b13d110575adc879aa90">
+<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
   <file src="lib/AppInfo/Application.php">
     <UndefinedClass>
       <code>BeforeTemplateRenderedEvent</code>
@@ -198,7 +198,7 @@
   </file>
   <file src="lib/Migration/Version2001Date20170707115443.php">
     <InvalidArrayAccess>
-      <code>$return['num_rooms']</code>
+      <code><![CDATA[$return['num_rooms']]]></code>
     </InvalidArrayAccess>
   </file>
   <file src="lib/Notification/Notifier.php">
@@ -225,6 +225,12 @@
     </UndefinedClass>
   </file>
   <file src="lib/Service/RecordingService.php">
+    <LessSpecificReturnStatement>
+      <code>$recordingFolder</code>
+    </LessSpecificReturnStatement>
+    <MoreSpecificReturnType>
+      <code>Folder</code>
+    </MoreSpecificReturnType>
     <UndefinedClass>
       <code>NoUserException</code>
       <code>NoUserException</code>
@@ -232,7 +238,7 @@
   </file>
   <file src="lib/Share/Listener.php">
     <InvalidArgument>
-      <code>[self::class, 'listenPreShare']</code>
+      <code><![CDATA[[self::class, 'listenPreShare']]]></code>
     </InvalidArgument>
     <UndefinedClass>
       <code><![CDATA[$event->getView()]]></code>