diff --git a/esp32_loraprs.ino b/esp32_loraprs.ino
index d075435..c6c45be 100644
--- a/esp32_loraprs.ino
+++ b/esp32_loraprs.ino
@@ -20,7 +20,7 @@
 // different module then update loraprs_service.h and loraprs_service.cpp
 // search for SX1278 and replace with your module name
 
-#define USE_RADIOLIB
+//#define USE_RADIOLIB
 #include "loraprs_service.h"
 
 void initializeConfig(LoraPrs::Config &cfg) {
diff --git a/loraprs_service.cpp b/loraprs_service.cpp
index c521115..71e845d 100644
--- a/loraprs_service.cpp
+++ b/loraprs_service.cpp
@@ -17,6 +17,7 @@ Service::Service()
   , serialBt_()
   , serialBLE_()
   , kissServer_(new WiFiServer(CfgKissPort))
+  , isKissConn_(false)
 {
 #ifdef USE_RADIOLIB
   interruptEnabled_ = true;
@@ -87,6 +88,7 @@ void Service::setupWifi(const String &wifiName, const String &wifiKey)
     Serial.println(WiFi.localIP());
   }
   if (config_.KissEnableTcpIp) {
+    Serial.print("KISS TCP/IP server started on port "); Serial.println(CfgKissPort);
     kissServer_->begin();
   }
 }
@@ -219,6 +221,9 @@ void Service::loop()
   if (needsAprsis() && !aprsisConn_.connected() && config_.EnablePersistentAprsConnection) {
     reconnectAprsis();
   }
+  if (config_.KissEnableTcpIp) {
+    attachKissNetworkClient();
+  }
 
   // RX path, Rig -> Serial
   bool isRigToSerialProcessed = false;
@@ -544,23 +549,30 @@ void Service::onRigTxEnd()
   }
 }
 
-bool Service::getClient(WiFiClient &activeClient) 
+void Service::attachKissNetworkClient() 
 {
-  if (config_.KissEnableTcpIp) {
+  // connected, client dropped off
+  if (isKissConn_) {
+    if (!kissConn_.connected()) {
+      Serial.println("KISS TCP/IP client disconnected");
+      isKissConn_ = false;
+      kissConn_.stop();
+    }
+  // not connected, new client connected
+  } else {
     WiFiClient wifiClient = kissServer_->available();
     if (wifiClient && wifiClient.connected()) {
-      activeClient = wifiClient;
-      return true;
+      Serial.println("New KISS TCP/IP client connected");
+      kissConn_ = wifiClient;
+      isKissConn_ = true;
     }
   }
-  return false;
 }
 
 void Service::onSerialTx(byte b)
 {
-  WiFiClient wifiClient;
-  if (getClient(wifiClient)) {
-    wifiClient.write(b);
+  if (isKissConn_) {
+    kissConn_.write(b);
   }
   else if (config_.BtEnableBle) {
     serialBLE_.write(b);
@@ -572,10 +584,8 @@ void Service::onSerialTx(byte b)
 
 bool Service::onSerialRxHasData()
 {
-  WiFiClient wifiClient;
-  if (getClient(wifiClient)) {
-    Serial.println("!!!");
-    return wifiClient.available();
+  if (isKissConn_) {
+    return kissConn_.available();
   }
   else if (config_.BtEnableBle) {
     return serialBLE_.available();
@@ -589,9 +599,8 @@ bool Service::onSerialRx(byte *b)
 {
   int rxResult;
   
-  WiFiClient wifiClient;
-  if (getClient(wifiClient)) {
-    rxResult = wifiClient.read();
+  if (isKissConn_) {
+    rxResult = kissConn_.read();
   }
   else {
     rxResult = config_.BtEnableBle 
diff --git a/loraprs_service.h b/loraprs_service.h
index 75cc338..f8a7c1e 100644
--- a/loraprs_service.h
+++ b/loraprs_service.h
@@ -38,6 +38,7 @@ private:
 
   void reconnectWifi() const;
   bool reconnectAprsis();
+  void attachKissNetworkClient();
 
   bool isLoraRxBusy();
 #ifdef USE_RADIOLIB
@@ -48,8 +49,6 @@ private:
   void loraReceive(int packetSize);
 #endif
   void onAprsisDataAvailable();
-
-  bool getClient(WiFiClient &activeClient);
   
   void sendSignalReportEvent(int rssi, float snr);
   void sendPeriodicBeacon();
@@ -114,7 +113,7 @@ private:
   const long CfgCsmaSlotTimeMs = 500;   // 0 for real time, otherwise set to average tx duration
 
   // kiss static parameters
-  const int CfgKissPort = 8081;             // kiss tcp/ip server port
+  const int CfgKissPort = 8001;             // kiss tcp/ip server port
 private:
   // config
   Config config_;
@@ -140,7 +139,10 @@ private:
   BluetoothSerial serialBt_;
   BLESerial serialBLE_;
   WiFiClient aprsisConn_;
+  
   std::shared_ptr<WiFiServer> kissServer_;
+  WiFiClient kissConn_;
+  bool isKissConn_;
 };
 
 } // LoraPrs