diff --git a/server/index.js b/server/index.js
index 66d2efc..27fc145 100644
--- a/server/index.js
+++ b/server/index.js
@@ -171,7 +171,7 @@ if (serverConfig.xdrd.wirelessConnection === false) {
     setTimeout(() => {
       serialport.write('Q0\n');
       serialport.write('M0\n');
-      serialport.write('Z0\n');
+      serialport.write(`Z${serverConfig.antennaStartup}\n`); // Antenna on startup
 
       if (serverConfig.defaultFreq && serverConfig.enableDefaultFreq === true) {
         serialport.write('T' + Math.round(serverConfig.defaultFreq * 1000) + '\n');
@@ -524,6 +524,17 @@ wss.on('connection', (ws, request) => {
             } else if (serverConfig.stereoNoUsers === "2") {
                 output.write("B1\n");
             }
+
+            // Handle Antenna selection
+            if (serverConfig.antennaNoUnsers === "1") {
+                output.write("Z0\n");
+            } else if (serverConfig.antennaNoUnsers === "2") {
+                output.write("Z1\n");
+            } else if (serverConfig.antennaNoUnsers === "3") {
+                output.write("Z2\n");
+            } else if (serverConfig.antennaNoUnsers === "4") {
+                output.write("Z3\n");
+            }
         }
 
         if (tunerLockTracker.has(ws)) {
diff --git a/server/server_config.js b/server/server_config.js
index cc36c81..5f754dc 100644
--- a/server/server_config.js
+++ b/server/server_config.js
@@ -113,7 +113,9 @@ let serverConfig = {
   imsStartup: "0",
   imsNoUsers: "0",
   stereoStartup: "0",
-  stereoNoUsers: "0"
+  stereoNoUsers: "0",
+  antennaStartup: "0",
+  antennaNoUnsers: "0"
 };
 
 // Function to add missing fields without overwriting existing values