From c9925f3fa88d3b191cb22ac76c9405d671604d01 Mon Sep 17 00:00:00 2001
From: Alex Yackovlev <aleksandryackovlev@yandex.ru>
Date: Tue, 5 May 2020 20:38:41 +0300
Subject: [PATCH] Prevent fall through in the model search method when a plugin
 is specified (#6004)

Signed-off-by: Aleksandr Yackovlev <a.yackovlev@corp.mail.ru>
---
 packages/strapi-database/lib/database-manager.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/strapi-database/lib/database-manager.js b/packages/strapi-database/lib/database-manager.js
index c1d99e0ca6..531d9c26ee 100644
--- a/packages/strapi-database/lib/database-manager.js
+++ b/packages/strapi-database/lib/database-manager.js
@@ -108,11 +108,11 @@ class DatabaseManager {
       return _.get(strapi.admin, ['models', key]);
     }
 
-    return (
-      _.get(strapi.plugins, [plugin, 'models', key]) ||
-      _.get(strapi, ['models', key]) ||
-      _.get(strapi, ['components', key])
-    );
+    if (plugin) {
+      return _.get(strapi.plugins, [plugin, 'models', key]);
+    }
+
+    return _.get(strapi, ['models', key]) || _.get(strapi, ['components', key]);
   }
 
   getModelByCollectionName(collectionName) {