diff --git a/prisma/migrations/20250415184546_add_packet_id_to_service_envelopes/migration.sql b/prisma/migrations/20250415184546_add_packet_id_to_service_envelopes/migration.sql
new file mode 100644
index 0000000..e0139d5
--- /dev/null
+++ b/prisma/migrations/20250415184546_add_packet_id_to_service_envelopes/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE `service_envelopes` ADD COLUMN `packet_id` BIGINT NULL;
+
+-- CreateIndex
+CREATE INDEX `service_envelopes_packet_id_idx` ON `service_envelopes`(`packet_id`);
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 660afbb..51b8a05 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -205,6 +205,7 @@ model ServiceEnvelope {
   to         BigInt
   from       BigInt
   portnum    Int?
+  packet_id  BigInt?
   protobuf   Bytes
 
   created_at DateTime @default(now())
@@ -213,6 +214,7 @@ model ServiceEnvelope {
   @@index(created_at)
   @@index(updated_at)
   @@index(gateway_id)
+  @@index(packet_id)
   @@map("service_envelopes")
 }
 
diff --git a/src/mqtt.js b/src/mqtt.js
index c82f89c..634c2cf 100644
--- a/src/mqtt.js
+++ b/src/mqtt.js
@@ -751,6 +751,7 @@ client.on("message", async (topic, message) => {
                         to: envelope.packet.to,
                         from: envelope.packet.from,
                         portnum: portnum,
+                        packet_id: envelope.packet.id,
                         protobuf: message,
                     },
                 });