diff --git a/MainForm.pas b/MainForm.pas
index 5c41b87..5079b9a 100644
--- a/MainForm.pas
+++ b/MainForm.pas
@@ -1059,7 +1059,6 @@ begin
   FSpecView.SpecRange      := FSpecRange;
   FSpecView.SpecGridStep   := FSpecGridStep;
   FSpecView.WfFrameInterval := FWaterfallFrameInterval;
-  FSpecView.FillDemoSpectrum;
 
   FNetwork := THPSDRNetwork.Create;
   FNetwork.OnDeviceFound := OnDeviceFound;
@@ -2587,8 +2586,9 @@ begin
     begin
       SaveCurrentBand;
       FSettings.SaveGlobal(FDevMAC, MakeGlobalSettings);
-      FSettings.Save;
     end;
+    FSettings.SaveStartupPreview(FVfoA, FVfoB, FSampleRate);
+    FSettings.Save;
     FSpecView.ResetSpectrumBuf;
     FSpecView.DrawSpectrum;
     PbSpectrum.Invalidate;