diff --git a/application/Espo/Controllers/Settings.php b/application/Espo/Controllers/Settings.php
index 44d39a3133..5593787faa 100644
--- a/application/Espo/Controllers/Settings.php
+++ b/application/Espo/Controllers/Settings.php
@@ -63,6 +63,12 @@ class Settings extends \Espo\Core\Controllers\Base
 			throw new Error('Cannot save settings');
 		}
 
+		/** Rebuild for Currency Settings */
+		if (isset($data['baseCurrency']) || isset($data['currencyRates'])) {
+			$this->getContainer()->get('dataManager')->rebuildDatabase(array());
+		}
+		/** END Rebuild for Currency Settings */
+
 		return $this->getConfigData();
 	}
 }