diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 7cd134a54..55376d28a 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -900,7 +900,7 @@ class AdminControllerCore extends Controller
 					if (Shop::isFeatureActive() && isset($options['visibility']) && $options['visibility'] > Shop::getContext())
 						continue;
 
-					if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && empty($_POST['multishopOverrideOption'][$key]))
+					if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && empty($options['no_multishop_checkbox']) && empty($_POST['multishopOverrideOption'][$key]))
 					{
 						Configuration::deleteFromContext($key);
 						continue;