diff --git a/src/HTTPConnection.cpp b/src/HTTPConnection.cpp
index 0ab739c..553a36c 100644
--- a/src/HTTPConnection.cpp
+++ b/src/HTTPConnection.cpp
@@ -664,7 +664,7 @@ void handleWebsocketHandshake(HTTPRequest * req, HTTPResponse * res) {
 std::string websocketKeyResponseHash(std::string const &key) {
   std::string newKey = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
   uint8_t shaData[HTTPS_SHA1_LENGTH];
-  esp_sha(SHA1, (uint8_t*)newKey.data(), newKey.length(), shaData);
+  mbedtls_sha1_ret((uint8_t*)newKey.data(), newKey.length(), shaData);
 
   // Get output size required for base64 representation
   size_t b64BufferSize = 0;
diff --git a/src/HTTPConnection.hpp b/src/HTTPConnection.hpp
index fb15d7a..bab6150 100644
--- a/src/HTTPConnection.hpp
+++ b/src/HTTPConnection.hpp
@@ -6,7 +6,7 @@
 
 #include <string>
 #include <mbedtls/base64.h>
-#include <hwcrypto/sha.h>
+#include <mbedtls/sha1.h>
 #include <functional>
 
 // Required for sockets
diff --git a/src/WebsocketHandler.cpp b/src/WebsocketHandler.cpp
index 5e4c1d1..779f946 100644
--- a/src/WebsocketHandler.cpp
+++ b/src/WebsocketHandler.cpp
@@ -1,5 +1,7 @@
 #include "WebsocketHandler.hpp"
-
+#ifndef TAG
+#define TAG "ARDUINO"
+#endif
 namespace httpsserver {
 
 /**
@@ -17,7 +19,7 @@ static void dumpFrame(WebsocketFrame frame) {
     case WebsocketHandler::OPCODE_TEXT: opcode = std::string("TEXT"); break;
   }
   ESP_LOGI(
-    TAG,
+    "",
     "Fin: %d, OpCode: %d (%s), Mask: %d, Len: %d",
     (int)frame.fin,
     (int)frame.opCode,