diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index f5cdfe972..15bbdd205 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2000,7 +2000,7 @@ class AdminControllerCore extends Controller
 		if ($this->multishop_context && Shop::isTableAssociated($this->table) && !empty($this->className))
 		{
 			$def = ObjectModel::getDefinition($this->className);
-			if (Shop::getContext() != Shop::CONTEXT_ALL || !empty($def['multishop_specific']) || !$this->context->employee->isSuperAdmin())
+			if (Shop::getContext() != Shop::CONTEXT_ALL || Shop::isTableAssociated($this->table) || !$this->context->employee->isSuperAdmin())
 			{
 				$idenfier_shop = Shop::getContextListShopID();
 				if (!$this->_group)