diff --git a/assets/js/cat.js b/assets/js/cat.js
index 7f23593e9..963987f95 100644
--- a/assets/js/cat.js
+++ b/assets/js/cat.js
@@ -1286,7 +1286,7 @@ $(document).ready(function() {
             $('#toggleCatTracking').removeClass('btn-success').addClass('btn-secondary');
             // Display offline status when no radio selected
             displayOfflineStatus('no_radio');
-        } else if (selectedRadioId == 'ws') {
+        } else if (selectedRadioId == 'ws' || (websocketEnabled && websocket !== null)) {
             websocketIntentionallyClosed = false; // Reset flag when opening WebSocket
             reconnectAttempts = 0; // Reset reconnect attempts
             hasTriedWsFallback = false; // Reset WSS failover state - try WSS first again
@@ -1303,15 +1303,29 @@ $(document).ready(function() {
                 displayOfflineStatus('cat_disabled');
             }
         } else {
-            // Set DX Waterfall CAT state to polling if variable exists
+            // Set DX Waterfall CAT state to polling
             if (typeof dxwaterfall_cat_state !== 'undefined') {
                 dxwaterfall_cat_state = "polling";
             }
-            // Enable CAT Control button when radio is selected
             $('#toggleCatTracking').prop('disabled', false).removeClass('disabled');
-            // Always start polling
-            CATInterval=setInterval(updateFromCAT, CAT_CONFIG.POLL_INTERVAL);
-            // In ultra-compact/icon-only mode, show offline status if CAT Control is disabled
+            
+            // Start standard polling
+            CATInterval = setInterval(updateFromCAT, CAT_CONFIG.POLL_INTERVAL);
+
+            // --- PR ADDITION: Auto-enable WebSocket for local CAT URLs ---
+            // Fetch radio details to check if we should also start WebSocket
+            $.getJSON(base_url + 'index.php/radio/json/' + selectedRadioId, function(data) {
+                if (data.cat_url) {
+                    const url = data.cat_url.toLowerCase();
+                    if (url.includes('127.0.0.1') || url.includes('localhost')) {
+                        console.log("CAT: Local CAT URL detected (" + data.cat_url + "). Initializing WebSocket...");
+                        websocketIntentionallyClosed = false;
+                        initializeWebSocketConnection();
+                    }
+                }
+            });
+            // -------------------------------------------------------------
+
             if ((window.CAT_COMPACT_MODE === 'ultra-compact' || window.CAT_COMPACT_MODE === 'icon-only') && typeof window.isCatTrackingEnabled !== 'undefined' && !window.isCatTrackingEnabled) {
                 displayOfflineStatus('cat_disabled');
             }
@@ -1323,4 +1337,47 @@ $(document).ready(function() {
 
     // Expose displayOfflineStatus globally for other components (e.g., bandmap CAT Control toggle)
     window.displayOfflineStatus = displayOfflineStatus;
+
+	/**
+     * Broadcast Callsign Lookup Result via WebSocket
+     * Triggered when Wavelog completes a callsign lookup.
+     * 
+     * @param {object} data - The lookup data object
+     */
+    window.broadcastLookupResult = function(data) {
+        if (!websocket || !websocketEnabled || websocket.readyState !== WebSocket.OPEN) {
+            return;
+        }
+
+        try {
+            const cleanAzimuth = data.bearing ? parseInt(data.bearing.match(/\d+/)) : null;
+
+            const message = {
+                type: 'lookup_result',
+                timestamp: new Date().toISOString(),
+                payload: {
+                    callsign: data.callsign,
+                    dxcc_id: data.dxcc_id,
+                    name: data.name,
+                    grid: data.gridsquare || data.grid,
+                    city: data.city,
+                    iota: data.iota,
+                    state: data.state,
+                    us_county: data.us_county,
+                    bearing: data.bearing,
+                    azimuth: cleanAzimuth,
+                    distance: data.distance,
+                    lotw_member: data.lotw_member,
+                    lotw_days: data.lotw_days,
+                    eqsl_member: data.eqsl_member,
+                    qsl_manager: data.qsl_manager,
+                    slot_confirmed: data.slot_confirmed
+                }
+            };
+
+            websocket.send(JSON.stringify(message));
+        } catch (error) {
+            console.warn('Failed to broadcast lookup result:', error);
+        }
+    };	
 });
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 71bd472e3..478d6d641 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -1453,6 +1453,29 @@ $("#callsign").on("focusout", function () {
 				// Reset QSO fields
 				resetDefaultQSOFields();
 
+				// --- Added for WebSocket Integration (Rotators / External Displays) ---
+				if (typeof window.broadcastLookupResult === 'function') {
+					const broadcastData = {
+						callsign: result.callsign,
+						dxcc_id: result.dxcc.adif,
+						name: result.callsign_name,
+						gridsquare: result.callsign_qra,
+						city: result.callsign_qth,
+						iota: result.callsign_iota,
+						state: result.callsign_state,
+						us_county: result.callsign_us_county,
+						bearing: result.bearing,
+						distance: result.callsign_distance,
+						lotw_member: result.lotw_member,
+						lotw_days: result.lotw_days,
+						eqsl_member: result.eqsl_member,
+						qsl_manager: result.qsl_manager,
+						slot_confirmed: result.dxcc_confirmed_on_band_mode
+					};
+					window.broadcastLookupResult(broadcastData);
+				}
+				// ---------------------------------------------------------
+
 				// Set qso icon
 				get_note_status(result.callsign);