diff --git a/plugins/eddn.py b/plugins/eddn.py
index 50cb402c..eee9e8d1 100644
--- a/plugins/eddn.py
+++ b/plugins/eddn.py
@@ -191,7 +191,7 @@ class EDDN:
                 """
                 CREATE TABLE messages
                 (
-                    id INT PRIMARY KEY NOT NULL,
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
                     created TEXT NOT NULL,
                     cmdr TEXT NOT NULL,
                     edmc_version TEXT,
@@ -202,6 +202,24 @@ class EDDN:
                 """
             )
 
+            replaydb.execute(
+                """
+                CREATE INDEX messages_created ON messages
+                (
+                    created
+                )
+                """
+            )
+
+            replaydb.execute(
+                """
+                CREATE INDEX messages_cmdr ON messages
+                (
+                    cmdr
+                )
+                """
+            )
+
         except sqlite3.OperationalError as e:
             if str(e) != "table messages already exists":
                 raise e