diff --git a/db/store.go b/db/store.go
index ef7a0fb..3308c0a 100644
--- a/db/store.go
+++ b/db/store.go
@@ -103,6 +103,9 @@ func (s *Store) InsertObservation(ctx context.Context, o ingest.InsertObservatio
 	if errors.Is(err, pgx.ErrNoRows) {
 		return false, nil // conflict, not an error
 	}
+	if err != nil {
+		return false, err
+	}
 	return row.ID != 0, nil
 }
 
diff --git a/internal/ingest/ingest.go b/internal/ingest/ingest.go
index 664b7b3..af4aabe 100644
--- a/internal/ingest/ingest.go
+++ b/internal/ingest/ingest.go
@@ -284,7 +284,8 @@ func (w *Worker) handleMessage(msg mqtt.Message) {
 	}
 	iata, pubkeyHex, subtopic := parts[1], parts[2], parts[3]
 
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
 
 	switch subtopic {
 	case "packets":
@@ -438,7 +439,7 @@ func (w *Worker) handlePacket(ctx context.Context, iata, pubkeyHex string, raw [
 	if inserted {
 		w.runCapabilityDetection(ctx, packet.PayloadType(), packet.PathHashSize(), resolvedIDs)
 		w.handlePayloadTypeSideEffects(ctx, packet, iata, packetHash[:])
-		w.fanOut(packetHash[:], packet, iata, isNew, id, envelope.Origin, heardAt, oParams.RSSI, oParams.SNR, w.cfg.BrokerName)
+		w.fanOut(packetHash[:], packet, iata, isNew, id, heardAt, oParams.RSSI, oParams.SNR, w.cfg.BrokerName)
 	}
 }
 
@@ -651,7 +652,7 @@ func (w *Worker) handlePayloadTypeSideEffects(ctx context.Context, packet *meshc
 }
 
 // fanOut builds and broadcasts the packetObservation event to connected WS clients.
-func (w *Worker) fanOut(packetHash []byte, p *meshcore.Packet, iata string, isFirst bool, observerID uuid.UUID, observerName string, heardAt time.Time, rssi int16, snr float32, sourceBroker string) {
+func (w *Worker) fanOut(packetHash []byte, p *meshcore.Packet, iata string, isFirst bool, observerID uuid.UUID, heardAt time.Time, rssi int16, snr float32, sourceBroker string) {
 	evt := packetObservationEvent{}
 	evt.PacketHash = hex.EncodeToString(packetHash)
 	evt.Packet.PayloadType = p.PayloadType()
diff --git a/internal/ws/handler.go b/internal/ws/handler.go
index 78bc33f..2aea5a7 100644
--- a/internal/ws/handler.go
+++ b/internal/ws/handler.go
@@ -86,6 +86,7 @@ func Handler(h *hub.Hub) http.HandlerFunc {
 					err = conn.Write(ctx, websocket.MessageText, msgBytes)
 					if err != nil {
 						log.Printf("ws[%s]: failed to write hub event: %v", connID, err)
+						cancel()
 						return
 					}
 				case <-ctx.Done():