diff --git a/main.qml b/main.qml
index 2a82a693..31450032 100644
--- a/main.qml
+++ b/main.qml
@@ -1156,13 +1156,10 @@ ApplicationWindow {
     Timer {
         id: fiatPriceTimer
         interval: 1000 * 60;
-        running: persistentSettings.fiatPriceEnabled;
+        running: persistentSettings.fiatPriceEnabled && currentWallet !== undefined
         repeat: true
-        onTriggered: {
-            if(persistentSettings.fiatPriceEnabled)
-                appWindow.fiatApiRefresh();
-        }
-        triggeredOnStart: false
+        onTriggered: appWindow.fiatApiRefresh()
+        triggeredOnStart: true
     }
 
     function fiatApiParseTicker(url, resp, currency){
@@ -1301,14 +1298,6 @@ ApplicationWindow {
         leftPanel.balanceFiatString = bFiat;
     }
 
-    function fiatTimerStart(){
-        fiatPriceTimer.start();
-    }
-
-    function fiatTimerStop(){
-        fiatPriceTimer.stop();
-    }
-
     function fiatApiError(msg){
         console.log("fiatPriceError: " + msg);
     }
@@ -1364,11 +1353,6 @@ ApplicationWindow {
             openWallet("wizard");
         }
 
-        if(persistentSettings.fiatPriceEnabled){
-            appWindow.fiatApiRefresh();
-            appWindow.fiatTimerStart();
-        }
-
         const desktopEntryEnabled = (typeof builtWithDesktopEntry != "undefined") && builtWithDesktopEntry;
         if (persistentSettings.askDesktopShortcut && !persistentSettings.portable && desktopEntryEnabled) {
             persistentSettings.askDesktopShortcut = false;
diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml
index 0e54f018..5ce192ba 100644
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -165,7 +165,6 @@ Rectangle {
                     if (!checked) {
                         console.log("Disabled price conversion");
                         persistentSettings.fiatPriceEnabled = false;
-                        appWindow.fiatTimerStop();
                     }
                 }
             }
@@ -232,8 +231,6 @@ Rectangle {
                 onClicked: {
                     console.log("Enabled price conversion");
                     persistentSettings.fiatPriceEnabled = true;
-                    appWindow.fiatApiRefresh();
-                    appWindow.fiatTimerStart();
                 }
             }
         }