diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp
index a5fed60de1..4c47871300 100644
--- a/src/src/DataStructs/Web_StreamingBuffer.cpp
+++ b/src/src/DataStructs/Web_StreamingBuffer.cpp
@@ -221,6 +221,8 @@ void Web_StreamingBuffer::startStream(bool allowOriginAll,
   sentBytes    = 0;
   buf.clear();
   buf.reserve(CHUNKED_BUFFER_SIZE);
+  web_server.client().setNoDelay(true);
+  web_server.client().setSSE(false);
   
   if (beforeTXRam < 3000) {
     lowMemorySkip = true;
@@ -290,6 +292,7 @@ void Web_StreamingBuffer::endStream() {
     lowMemorySkip = false;
   }
   delay(5);
+//  web_server.client().stop();
 }
 
 
@@ -402,7 +405,7 @@ void Web_StreamingBuffer::sendHeaderBlocking(bool allowOriginAll,
     web_server.sendHeader(F("Access-Control-Allow-Origin"), origin);
   }
   web_server.send(httpCode, content_type, EMPTY_STRING);
-
+#ifdef ESP8266
   // dont wait on 2.3.0. Memory returns just too slow.
   while ((ESP.getFreeHeap() < freeBeforeSend) &&
          !timeOutReached(beginWait + timeout)) {
@@ -411,6 +414,7 @@ void Web_StreamingBuffer::sendHeaderBlocking(bool allowOriginAll,
     #endif
     delay(1);
   }
+#endif
 #endif // if defined(ESP8266) && defined(ARDUINO_ESP8266_RELEASE_2_3_0)
   delay(0);
 }
diff --git a/src/src/WebServer/Rules.cpp b/src/src/WebServer/Rules.cpp
index ecde7b476f..28a5ce04cb 100644
--- a/src/src/WebServer/Rules.cpp
+++ b/src/src/WebServer/Rules.cpp
@@ -549,7 +549,9 @@ void Rule_showRuleTextArea(const String& fileName) {
   addHtml(F("<textarea id='rules' name='rules' rows='30' wrap='off'>"));
   size = streamFromFS(fileName, true);
   addHtml(F("</textarea>"));
+  #if FEATURE_RULES_EASY_COLOR_CODE
   addHtml(F("<script>initCM();</script>"));
+  #endif
 
   html_TR_TD();
   addHtml(F("Current size: <span id='size'>"));