diff --git a/.circleci/config.yml b/.circleci/config.yml
index ae97ca9..8155233 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -127,7 +127,7 @@ jobs:
       - fastlane_setup_android
       - run:
           name: Build Android APK
-          command: flutter build apk
+          command: flutter build apk --dart-define=currencyApiKey=%CURRENCY_API_KEY%
       - store_artifacts:
           path: build/app/outputs/flutter-apk/app-release.apk
       - run:
diff --git a/lib/main_view_model.dart b/lib/main_view_model.dart
index 6ab030c..d155043 100644
--- a/lib/main_view_model.dart
+++ b/lib/main_view_model.dart
@@ -35,6 +35,7 @@ class MainViewModel extends BaseViewmodel {
   }
 
   void setCurrencyRate(String fromCurrency, String toCurrency) {
+    if (fromCurrency == toCurrency) return;
     onStart();
     _repository.getConversationRateFromApi(fromCurrency, toCurrency).then(
         (value) {
diff --git a/pubspec.yaml b/pubspec.yaml
index f76acf3..93285e2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 6.1.3+10
+version: 6.1.4+11
 
 environment:
   sdk: '>=2.18.0-190.0.dev <3.0.0'