diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index d84a5c12c3..bb50331b76 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -36,6 +36,7 @@ function handleRegions()
             api_get_utc_datetime(),
             $user_id
         );
+        api_flush_settings_cache(api_get_current_access_url_id());
         echo Display::return_message(get_lang('SettingsStored'), 'confirmation');
     }
 
@@ -1561,6 +1562,7 @@ function addEditTemplate()
                 echo Display::return_message(get_lang('TemplateEdited'), 'confirm');
             }
         }
+        api_flush_settings_cache(api_get_current_access_url_id());
         Security::clear_token('frm');
         header('Location: '.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Templates');
         exit;
diff --git a/main/admin/settings.php b/main/admin/settings.php
index 950ba46ec0..9742d065d3 100755
--- a/main/admin/settings.php
+++ b/main/admin/settings.php
@@ -444,7 +444,6 @@ if (!empty($_GET['category'])) {
     switch ($_GET['category']) {
         case 'Regions':
             handleRegions();
-            $flushSettings = true;
             break;
         case 'Plugins':
             // Displaying the extensions: Plugins.
@@ -509,7 +508,6 @@ if (!empty($_GET['category'])) {
             break;
         case 'Templates':
             handleTemplates();
-            $flushSettings = true;
             break;
         case 'search_setting':
             if (isset($_REQUEST['search_field'])) {