diff --git a/assets/js/dxwaterfall.js b/assets/js/dxwaterfall.js
index fe546affa..ec250cfef 100644
--- a/assets/js/dxwaterfall.js
+++ b/assets/js/dxwaterfall.js
@@ -1129,6 +1129,8 @@ var DX_WATERFALL_UTILS = {
                 // Only populate form if explicitly requested
                 if (shouldPrefill && spotInfo) {
                     var self = this;
+                    // Clear form before populating
+                    DX_WATERFALL_UTILS.qsoForm.clearForm();
                     this.pendingNavigationTimer = setTimeout(function() {
                         DX_WATERFALL_UTILS.qsoForm.populateFromSpot(spotInfo, true);
                         self.pendingNavigationTimer = null;
@@ -6598,6 +6600,9 @@ function setFrequency(frequencyInKHz, fromWaterfall) {
                 dxWaterfall.updateZoomMenu(true); // Force update with forceUpdate=true
             }, 300); // After frequency has settled
 
+            // Clear form before populating with clicked spot
+            DX_WATERFALL_UTILS.qsoForm.clearForm();
+
             // Populate QSO form - flag will be cleared when population completes
             DX_WATERFALL_UTILS.qsoForm.populateFromSpot(clickedSpot, true);