diff --git a/src/github.com/matrix-org/dendrite/appservice/storage/appservice_events_table.go b/src/github.com/matrix-org/dendrite/appservice/storage/appservice_events_table.go
index ab6848b43..7bff2c495 100644
--- a/src/github.com/matrix-org/dendrite/appservice/storage/appservice_events_table.go
+++ b/src/github.com/matrix-org/dendrite/appservice/storage/appservice_events_table.go
@@ -120,8 +120,9 @@ func (s *eventsStatements) selectEventsByApplicationServiceID(
 	defer func() {
 		err = eventRowsCurr.Close()
 		if err != nil {
-			log.WithError(err).Fatalf("Appservice %s unable to select new events to send",
-				applicationServiceID)
+			log.WithFields(log.Fields{
+				"appservice": applicationServiceID,
+			}).WithError(err).Fatalf("appservice unable to select new events to send")
 		}
 	}()
 	events, maxID, txnID, err = retrieveEvents(eventRowsCurr, limit)