diff --git a/classes/Currency.php b/classes/Currency.php
index ea56d7783..46e77b188 100644
--- a/classes/Currency.php
+++ b/classes/Currency.php
@@ -364,10 +364,8 @@ class CurrencyCore extends ObjectModel
 					}
 			}
 
-			if (!isset($rate))
-				$rate = 1;
-
-			$this->conversion_rate = round($rate / $conversion_rate, 6);
+			if (isset($rate))
+				$this->conversion_rate = round($rate / $conversion_rate, 6);
 		}
 		$this->update();
 	}