diff --git a/backend/src/Model/TreeNode.ts b/backend/src/Model/TreeNode.ts
index c0a8b9a..ee1491d 100644
--- a/backend/src/Model/TreeNode.ts
+++ b/backend/src/Model/TreeNode.ts
@@ -5,7 +5,7 @@ export class TreeNode<ViewModel> {
   public sourceEdge?: Edge<ViewModel>
   public message?: Message
   public mqttMessage?: MqttMessage
-  public messageHistory: RingBuffer<Message> = new RingBuffer<Message>(3000, 100)
+  public messageHistory: RingBuffer<Message> = new RingBuffer<Message>(20000, 100)
   public viewModel?: ViewModel
   public edges: {[s: string]: Edge<ViewModel>} = {}
   public edgeArray: Array<Edge<ViewModel>> = []
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 7af125e..b0d8156 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -46,8 +46,8 @@ export class ConnectionManager {
     const messageEvent = makeConnectionMessageEvent(connectionId)
     connection.onMessage((topic: string, payload: Buffer, packet: any) => {
       let buffer = payload
-      if (buffer.length > 10000) {
-        buffer = buffer.slice(0, 10000)
+      if (buffer.length > 20000) {
+        buffer = buffer.slice(0, 20000)
       }
 
       backendEvents.emit(messageEvent, { topic, payload: Base64Message.fromBuffer(buffer), qos: packet.qos, retain: packet.retain })