diff --git a/phpmyfaq/admin/instances.php b/phpmyfaq/admin/instances.php
index af84e1ad06..f8afe9a07e 100644
--- a/phpmyfaq/admin/instances.php
+++ b/phpmyfaq/admin/instances.php
@@ -70,6 +70,7 @@
         $system = new System();
         $updatedClient = new Client($faqConfig);
         $moveInstance = false;
+        $instance->setId($instanceId);
 
         // Collect updated data for database
         $updatedData = new InstanceEntity();
@@ -80,7 +81,7 @@
         // Original data
         $originalData = $currentClient->getInstanceById($instanceId);
 
-        if ($originalData->url !== $updatedData->getUrl()) {
+        if ($originalData->url !== $updatedData->getUrl() && !$instance->getConfig('isMaster')) {
             $moveInstance = true;
         }