diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 8a136d338..a6e9ccdcc 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -173,7 +173,9 @@ class Logbook_model extends CI_Model {
 			$tx_power = null;
 		}
 
-		if (($this->input->post('radio',TRUE) ?? 0) != 0) {
+		if (($this->input->post('radio',TRUE) ?? '') == 'ws') {	// WebSocket
+			$radio_name=$this->input->post('radio_ws_name',TRUE);
+		} elseif (($this->input->post('radio',TRUE) ?? 0) != 0) {
 			$this->load->model('cat');
 			$radio_name=$this->cat->radio_status($this->input->post('radio',TRUE))->row()->radio ?? '';
 		} else {
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index e51ebf0d7..bd657926b 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -409,6 +409,7 @@ if (typeof window.DX_WATERFALL_FIELD_MAP === 'undefined') {
                   <option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id && $manual_mode == '0') { echo "selected=\"selected\""; } ?>><?= __("Polling - ") . $row->radio; ?> <?php if ($radio_last_updated->id == $row->id) { echo "(".__("last updated").")"; } else { echo ''; } ?></option>
                 <?php } ?>
                 </select>
+                <input type="hidden" id="radio_ws_name" name="radio_ws_name" value="" />
             </div>
 
             <div class="mb-3">
diff --git a/assets/js/cat.js b/assets/js/cat.js
index c2dd15ad8..be0e6e27d 100644
--- a/assets/js/cat.js
+++ b/assets/js/cat.js
@@ -593,6 +593,11 @@ $(document).ready(function() {
         // Build icon with Bootstrap color class and ID for animation
         var icon = '<i id="radio-status-icon" class="fas fa-radio ' + iconClass + '" style="margin-right: 10px; font-size: 1.2em;"></i>';
         var html = baseStyle + icon + content + '</div>';
+	if (($(".radios option:selected").val() == 'ws') && (data.radio != undefined)) {	// Are we on websocket? add hiddenfield with radioName
+		$("#radio_ws_name").val(data.radio);
+	} else {
+		$("#radio_ws_name").val('');
+	}
 
 		// Update DOM based on global CAT_COMPACT_MODE setting
 		if (window.CAT_COMPACT_MODE === 'icon-only') {
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index 1d57e53aa..f4902672d 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -548,6 +548,17 @@ $('#radio').change(function () {
 	}
 });
 
+// Handle manual frequency entry - sync visible field to hidden field
+$('#freq_calculated').on('change', function() {
+	// set_new_qrg() is defined in qrg_handler.js and will:
+	// 1. Parse the frequency value and convert to Hz
+	// 2. Update #frequency (hidden field)
+	// 3. Update #band selector to match the frequency
+	if (typeof set_new_qrg === 'function') {
+		set_new_qrg();
+	}
+});
+
 function setSerial(data) {
 	var serialsent = 1;
 	if (data.serialsent != "") {