diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
index 9915599..d4d1b76 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
@@ -76,7 +76,7 @@ VNA::VNA(AppWindow *window, QString name)
 
     configurationTimer.setSingleShot(true);
     connect(&configurationTimer, &QTimer::timeout, this, [=](){
-        ConfigureDevice();
+        ConfigureDevice(configurationTimerResetTraces);
     });
 
     // Create default traces
@@ -725,7 +725,7 @@ void VNA::initializeDevice()
     }
     // Configure initial state of device
     ConstrainAndUpdateFrequencies();
-    SettingsChanged();
+    SettingsChanged(true);
     emit deviceInitialized();
     if(window->getDevice() && !cal.validForDevice(window->getDevice()->getSerial())) {
         InformationBox::ShowMessage("Invalid calibration", "The current calibration was created for a different device. You can still use it but the resulting "
@@ -940,13 +940,12 @@ void VNA::NewDatapoint(DeviceDriver::VNAMeasurement m)
     lastPoint = m_avg.pointNum;
 
     if (needsSegmentUpdate) {
-        changingSettings = true;
         if( settings.activeSegment < settings.segments - 1) {
             settings.activeSegment++;
         } else {
             settings.activeSegment = 0;
         }
-        SettingsChanged();
+        SettingsChanged(false);
     }
 }
 
@@ -955,11 +954,14 @@ void VNA::UpdateAverageCount()
     lAverages->setText(QString::number(average.getLevel()) + "/");
 }
 
-void VNA::SettingsChanged()
+void VNA::SettingsChanged(bool resetTraces)
 {
     configurationTimer.start(100);
     changingSettings = true;
-    ResetLiveTraces();
+    configurationTimerResetTraces = resetTraces;
+    if(resetTraces) {
+        ResetLiveTraces();
+    }
 }
 
 void VNA::StartImpedanceMatching()
diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/vna.h b/Software/PC_Application/LibreVNA-GUI/VNA/vna.h
index 374e73c..653146c 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/vna.h
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/vna.h
@@ -118,7 +118,7 @@ private:
     bool CalibrationMeasurementActive() { return calWaitFirst || calMeasuring; }
     void SetupSCPI();
     void UpdateAverageCount();
-    void SettingsChanged();
+    void SettingsChanged(bool resetTraces = true);
     void ConstrainAndUpdateFrequencies();
     void LoadSweepSettings();
     void StoreSweepSettings();
@@ -143,6 +143,7 @@ private:
     bool singleSweep;
     bool running;
     QTimer configurationTimer;
+    bool configurationTimerResetTraces;
 
     // Calibration
     Calibration cal;