diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index e1d6d22..b8c34d2 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -189,12 +189,14 @@ void NukiOpenerWrapper::updateAuthData()
     }
     delay(100);
 
-    result = _nukiOpener.retrieveLogEntries(0, 5, 1, false);
+    uint16_t count = _nukiOpener.getLogEntryCount();
+
+    result = _nukiOpener.retrieveLogEntries(0, count < 5 ? count : 5, 1, false);
     if(result != Nuki::CmdResult::Success)
     {
         return;
     }
-    delay(200);
+    delay(1000);
 
     std::list<NukiOpener::LogEntry> log;
     _nukiOpener.getLogEntries(&log);
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 90702d0..6f55609 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -218,19 +218,21 @@ void NukiWrapper::updateAuthData()
     }
     delay(100);
 
-    result = _nukiLock.retrieveLogEntries(0, 10, 1, false);
+    uint16_t count = _nukiLock.getLogEntryCount();
+
+    result = _nukiLock.retrieveLogEntries(0, count < 5 ? count : 5, 1, false);
     if(result != Nuki::CmdResult::Success)
     {
         return;
     }
-    delay(200);
+    delay(1000);
 
     std::list<NukiLock::LogEntry> log;
     _nukiLock.getLogEntries(&log);
 
     if(log.size() > 0)
     {
-             _network->publishAuthorizationInfo(log);
+         _network->publishAuthorizationInfo(log);
     }
 }
 
diff --git a/lib/pubsubclient/src/PubSubClient.h b/lib/pubsubclient/src/PubSubClient.h
index c70d9fd..fe5ced0 100755
--- a/lib/pubsubclient/src/PubSubClient.h
+++ b/lib/pubsubclient/src/PubSubClient.h
@@ -23,7 +23,7 @@
 
 // MQTT_MAX_PACKET_SIZE : Maximum packet size. Override with setBufferSize().
 #ifndef MQTT_MAX_PACKET_SIZE
-#define MQTT_MAX_PACKET_SIZE 256
+#define MQTT_MAX_PACKET_SIZE 6144
 #endif
 
 // MQTT_KEEPALIVE : keepAlive interval in Seconds. Override with setKeepAlive()