diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index ff08fc591..789545bc2 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1980,7 +1980,7 @@ class AdminControllerCore extends Controller
 		}
 
 		$filter_shop = '';
-		if ($this->multishop_context && Shop::isTableAssociated($this->table))
+		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']))