diff --git a/src/AsyncEventSource.cpp b/src/AsyncEventSource.cpp
index 69371c6..0efdbd5 100644
--- a/src/AsyncEventSource.cpp
+++ b/src/AsyncEventSource.cpp
@@ -156,7 +156,6 @@ size_t AsyncEventSourceMessage::send(AsyncClient *client) {
 // Client
 
 AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server)
-: _messageQueue(LinkedList<AsyncEventSourceMessage *>([](AsyncEventSourceMessage *m){ delete  m; }))
 {
   _client = request->client();
   _server = server;
@@ -180,7 +179,7 @@ AsyncEventSourceClient::~AsyncEventSourceClient(){
 #ifdef ESP32
   std::lock_guard<std::mutex> lock(_lockmq);
 #endif
-  _messageQueue.free();
+  _messageQueue.clear();
   close();
 }
 
@@ -195,7 +194,7 @@ void AsyncEventSourceClient::_queueMessage(AsyncEventSourceMessage *dataMessage)
   //length() is not thread-safe, thus acquiring the lock before this call..
   std::lock_guard<std::mutex> lock(_lockmq);
 #endif
-  if(_messageQueue.length() >= SSE_MAX_QUEUED_MESSAGES){
+  if(_messageQueue.size() >= SSE_MAX_QUEUED_MESSAGES){
 #ifdef ESP8266
     ets_printf(String(F("ERROR: Too many messages queued\n")).c_str());
 #else
@@ -203,7 +202,7 @@ void AsyncEventSourceClient::_queueMessage(AsyncEventSourceMessage *dataMessage)
 #endif
       delete dataMessage;
   } else {
-    _messageQueue.add(dataMessage);
+    _messageQueue.emplace_back(dataMessage);
     // runqueue trigger when new messages added
     if(_client->canSend()) {
       _runQueue();
@@ -216,10 +215,10 @@ void AsyncEventSourceClient::_onAck(size_t len, uint32_t time){
   // Same here, acquiring the lock early
   std::lock_guard<std::mutex> lock(_lockmq);
 #endif
-  while(len && !_messageQueue.isEmpty()){
+  while(len && _messageQueue.size()){
     len = _messageQueue.front()->ack(len, time);
     if(_messageQueue.front()->finished())
-      _messageQueue.remove(_messageQueue.front());
+      _messageQueue.pop_front();
   }
   _runQueue();
 }
@@ -229,7 +228,7 @@ void AsyncEventSourceClient::_onPoll(){
   // Same here, acquiring the lock early
   std::lock_guard<std::mutex> lock(_lockmq);
 #endif
-  if(!_messageQueue.isEmpty()){
+  if(_messageQueue.size()){
     _runQueue();
   }
 }
@@ -261,19 +260,15 @@ size_t AsyncEventSourceClient::packetsWaiting() const {
 #ifdef ESP32
     std::lock_guard<std::mutex> lock(_lockmq);
 #endif
-    size_t len = _messageQueue.length();
-    return len;
+    return _messageQueue.size();
 }
 
 void AsyncEventSourceClient::_runQueue() {
   // Calls to this private method now already protected by _lockmq acquisition
   // so no extra call of _lockmq.lock() here..
-  for (auto i = _messageQueue.begin(); i != _messageQueue.end(); ++i) {
-    // If it crashes here, iterator (i) has been invalidated as _messageQueue
-    // has been changed... (UL 2020-11-15: Not supposed to happen any more ;-) )
-    if (!(*i)->sent()) {
-      (*i)->send(_client);
-    }
+  for ( auto &i : _messageQueue){
+    if (!i->sent())
+      i->send(_client);
   }
 }
 
diff --git a/src/AsyncEventSource.h b/src/AsyncEventSource.h
index 6d76b2f..79ccc26 100644
--- a/src/AsyncEventSource.h
+++ b/src/AsyncEventSource.h
@@ -21,6 +21,7 @@
 #define ASYNCEVENTSOURCE_H_
 
 #include <Arduino.h>
+#include <list>
 #ifdef ESP32
 #include <mutex>
 #include <AsyncTCP.h>
@@ -54,8 +55,8 @@
 class AsyncEventSource;
 class AsyncEventSourceResponse;
 class AsyncEventSourceClient;
-typedef std::function<void(AsyncEventSourceClient *client)> ArEventHandlerFunction;
-typedef std::function<bool(AsyncWebServerRequest *request)> ArAuthorizeConnectHandler;
+using ArEventHandlerFunction = std::function<void(AsyncEventSourceClient *client)>;
+using ArAuthorizeConnectHandler = std::function<bool(AsyncWebServerRequest *request)>;
 
 class AsyncEventSourceMessage {
   private:
@@ -78,7 +79,7 @@ class AsyncEventSourceClient {
     AsyncClient *_client;
     AsyncEventSource *_server;
     uint32_t _lastId;
-    LinkedList<AsyncEventSourceMessage *> _messageQueue;
+    std::list< std::unique_ptr<AsyncEventSourceMessage> > _messageQueue;
     // ArFi 2020-08-27 for protecting/serializing _messageQueue
 #ifdef ESP32
     mutable std::mutex _lockmq;