diff --git a/measure-android/measure/src/main/java/sh/measure/android/storage/Database.kt b/measure-android/measure/src/main/java/sh/measure/android/storage/Database.kt
index 9320ee25a..a0216c006 100644
--- a/measure-android/measure/src/main/java/sh/measure/android/storage/Database.kt
+++ b/measure-android/measure/src/main/java/sh/measure/android/storage/Database.kt
@@ -206,6 +206,11 @@ internal class DatabaseImpl(
             db.execSQL(Sql.CREATE_ATTACHMENTS_TABLE)
             db.execSQL(Sql.CREATE_EVENTS_BATCH_TABLE)
             db.execSQL(Sql.CREATE_USER_DEFINED_ATTRIBUTES_TABLE)
+            db.execSQL(Sql.CREATE_EVENTS_TIMESTAMP_INDEX)
+            db.execSQL(Sql.CREATE_EVENTS_SESSION_ID_INDEX)
+            db.execSQL(Sql.CREATE_EVENTS_BATCH_EVENT_ID_INDEX)
+            db.execSQL(Sql.CREATE_SESSIONS_CREATED_AT_INDEX)
+            db.execSQL(Sql.CREATE_SESSIONS_NEEDS_REPORTING_INDEX)
         } catch (e: SQLiteException) {
             logger.log(LogLevel.Error, "Failed to create database", e)
         }
diff --git a/measure-android/measure/src/main/java/sh/measure/android/storage/DbConstants.kt b/measure-android/measure/src/main/java/sh/measure/android/storage/DbConstants.kt
index 065ccb8e0..499ae3aa7 100644
--- a/measure-android/measure/src/main/java/sh/measure/android/storage/DbConstants.kt
+++ b/measure-android/measure/src/main/java/sh/measure/android/storage/DbConstants.kt
@@ -73,6 +73,14 @@ internal object Sql {
         )
     """
 
+    const val CREATE_EVENTS_TIMESTAMP_INDEX = """
+        CREATE INDEX IF NOT EXISTS events_timestamp_index ON ${EventTable.TABLE_NAME} (${EventTable.COL_TIMESTAMP})
+    """
+
+    const val CREATE_EVENTS_SESSION_ID_INDEX = """
+        CREATE INDEX IF NOT EXISTS events_session_id_index ON ${EventTable.TABLE_NAME} (${EventTable.COL_SESSION_ID})
+    """
+
     const val CREATE_ATTACHMENTS_TABLE = """
         CREATE TABLE ${AttachmentTable.TABLE_NAME} (
             ${AttachmentTable.COL_ID} TEXT PRIMARY KEY,
@@ -96,6 +104,10 @@ internal object Sql {
         )
     """
 
+    const val CREATE_EVENTS_BATCH_EVENT_ID_INDEX = """
+        CREATE INDEX IF NOT EXISTS events_batch_event_id_index ON ${EventsBatchTable.TABLE_NAME} (${EventsBatchTable.COL_EVENT_ID})
+    """
+
     const val CREATE_SESSIONS_TABLE = """
         CREATE TABLE ${SessionsTable.TABLE_NAME} (
             ${SessionsTable.COL_SESSION_ID} TEXT PRIMARY KEY,
@@ -107,6 +119,14 @@ internal object Sql {
         )
     """
 
+    const val CREATE_SESSIONS_CREATED_AT_INDEX = """
+        CREATE INDEX IF NOT EXISTS INDEX sessions_created_at_index ON ${SessionsTable.TABLE_NAME} (${SessionsTable.COL_CREATED_AT})
+    """
+
+    const val CREATE_SESSIONS_NEEDS_REPORTING_INDEX = """
+        CREATE INDEX IF NOT EXISTS sessions_needs_reporting_index ON ${SessionsTable.TABLE_NAME} (${SessionsTable.COL_NEEDS_REPORTING})
+    """
+
     const val CREATE_USER_DEFINED_ATTRIBUTES_TABLE = """
         CREATE TABLE ${UserDefinedAttributesTable.TABLE_NAME} (
             ${UserDefinedAttributesTable.COL_KEY} TEXT PRIMARY KEY,
@@ -219,24 +239,6 @@ internal object Sql {
         """.trimIndent()
     }
 
-    fun getEventForId(eventId: String): String {
-        return """
-            SELECT 
-                ${EventTable.COL_ID},
-                ${EventTable.COL_SESSION_ID},
-                ${EventTable.COL_TIMESTAMP},
-                ${EventTable.COL_TYPE},
-                ${EventTable.COL_USER_TRIGGERED},
-                ${EventTable.COL_DATA_SERIALIZED},
-                ${EventTable.COL_DATA_FILE_PATH},
-                ${EventTable.COL_ATTACHMENTS},
-                ${EventTable.COL_ATTRIBUTES},
-                ${EventTable.COL_USER_DEFINED_ATTRIBUTES}
-            FROM ${EventTable.TABLE_NAME}
-            WHERE ${EventTable.COL_ID} = '$eventId'
-        """.trimIndent()
-    }
-
     fun getAttachmentsForEventIds(eventIds: List<String>): String {
         return """
             SELECT