diff --git a/lib/BufferedTelnetStream/BufferedTelnetStream.h b/lib/BufferedTelnetStream/BufferedTelnetStream.h
deleted file mode 100644
index ce11a39..0000000
--- a/lib/BufferedTelnetStream/BufferedTelnetStream.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-#include "ESPTelnetStream.h"
-
-class BufferedTelnetStream : public ESPTelnetStream {
-public:
-  size_t write(const uint8_t* data, size_t size) override {
-    if (client && isConnected()) {
-      return client.write(data, size);
-    } else {
-      return 0;
-    }
-  }
-};
\ No newline at end of file
diff --git a/src/MainTask.h b/src/MainTask.h
index 7c55289..142b165 100644
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -5,7 +5,7 @@ extern SensorsTask* tSensors;
 extern OpenThermTask* tOt;
 extern EEManager eeSettings;
 #if USE_TELNET
-  extern BufferedTelnetStream TelnetStream;
+  extern ESPTelnetStream TelnetStream;
 #endif
 
 
diff --git a/src/main.cpp b/src/main.cpp
index 95fdfcc..a5e1ccb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,7 +6,7 @@
 #include "Settings.h"
 
 #if USE_TELNET
-  #include "BufferedTelnetStream.h"
+  #include "ESPTelnetStream.h"
 #endif
 
 #if defined(ESP32)
@@ -29,7 +29,7 @@
 // Vars
 EEManager eeSettings(settings, 60000);
 #if USE_TELNET
-  BufferedTelnetStream TelnetStream;
+  ESPTelnetStream TelnetStream;
 #endif
 
 // Tasks
@@ -54,6 +54,7 @@ void setup() {
   #endif
 
   #if USE_TELNET
+    TelnetStream.setKeepAliveInterval(500);
     Log.addStream(&TelnetStream);
   #endif
   //Log.setNtpClient(&timeClient);