diff --git a/composer.json b/composer.json
index 53489235347..28fd39d4bad 100644
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,6 @@
 			"OCA\\Talk\\": "lib/"
 		}
 	},
-	"autoload-dev": {
-		"psr-4": {
-			"OCP\\": "vendor/nextcloud/ocp/OCP"
-		}
-	},
 	"config": {
 		"allow-plugins": {
 			"bamarni/composer-bin-plugin": true
diff --git a/psalm.xml b/psalm.xml
index 418874188fe..3aed17918b6 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -14,6 +14,10 @@
 			<directory name="vendor" />
 		</ignoreFiles>
 	</projectFiles>
+	<extraFiles>
+		<directory name="lib/Vendor" />
+		<directory name="vendor" />
+	</extraFiles>
 	<issueHandlers>
 		<UndefinedClass>
 			<errorLevel type="suppress">