diff --git a/gui/src/components/settings_gui.vue b/gui/src/components/settings_gui.vue
index 420195fd..1cb574fe 100644
--- a/gui/src/components/settings_gui.vue
+++ b/gui/src/components/settings_gui.vue
@@ -8,8 +8,8 @@ setActivePinia(pinia);
 import { settingsStore as settings } from "../store/settingsStore.js";
 
 function saveSettings() {
-  saveSettingsToFile();
-  setColormap(settings.wftheme);
+  //saveSettingsToFile();
+  setColormap(settings.local.wf_theme);
 }
 </script>
 <template>
@@ -58,7 +58,7 @@ function saveSettings() {
       class="form-select form-select-sm w-50"
       id="wftheme_selector"
       @change="saveSettings"
-      v-model="settings.wftheme"
+      v-model="settings.local.wf_theme"
     >
       <option value="2">Default</option>
       <option value="0">Turbo</option>
diff --git a/gui/src/js/waterfallHandler.js b/gui/src/js/waterfallHandler.js
index 85b35aea..bcad9a99 100644
--- a/gui/src/js/waterfallHandler.js
+++ b/gui/src/js/waterfallHandler.js
@@ -13,6 +13,7 @@ export function initWaterfall() {
     spectrumPercent: 0,
     wf_rows: 192, //Assuming 1 row = 1 pixe1, 192 is the height of the spectrum container
   });
+  setColormap(settings.local.wf_theme);
 }
 
 export function addDataToWaterfall(data) {
diff --git a/gui/src/store/settingsStore.js b/gui/src/store/settingsStore.js
index 27ddb29c..4a1e1b20 100644
--- a/gui/src/store/settingsStore.js
+++ b/gui/src/store/settingsStore.js
@@ -1,7 +1,6 @@
 import { reactive, ref, watch } from "vue";
 
 import { getConfig, setConfig } from "../js/api";
-import { initWaterfall } from "../js/waterfallHandler";
 
 export const settingsStore = reactive({
   local: {
@@ -9,6 +8,7 @@ export const settingsStore = reactive({
     port: "5000",
     enable_fft: false,
     spectrum: "waterfall",
+    wf_theme: 0,
   },
   remote: {
     AUDIO: {