diff --git a/journal/postgres/telemetry.go b/journal/postgres/telemetry.go
index a820397897..f46f42d039 100644
--- a/journal/postgres/telemetry.go
+++ b/journal/postgres/telemetry.go
@@ -188,17 +188,15 @@ func (repo *repository) IncrementOutboundMessages(ctx context.Context, channelID
 		var clientID string
 		var count uint64
 		if err = rows.Scan(&clientID, &count); err != nil {
-			err := tx.Rollback()
-			if err == nil {
-				return postgres.HandleError(repoerr.ErrUpdateEntity, err)
+			if err := tx.Rollback(); err != nil {
+				return errors.Wrap(errors.ErrRollbackTx, err)
 			}
-			return errors.Wrap(errors.ErrRollbackTx, err)
+			return postgres.HandleError(repoerr.ErrUpdateEntity, err)
 		}
 
 		if _, err = repo.db.ExecContext(ctx, q, count, clientID); err != nil {
-			err := tx.Rollback()
-			if err == nil {
-				return postgres.HandleError(repoerr.ErrUpdateEntity, err)
+			if err := tx.Rollback(); err != nil {
+				return errors.Wrap(errors.ErrRollbackTx, err)
 			}
 			return errors.Wrap(errors.ErrRollbackTx, err)
 		}
diff --git a/ws/adapter_test.go b/ws/adapter_test.go
index 0bb69a8ff9..9348201026 100644
--- a/ws/adapter_test.go
+++ b/ws/adapter_test.go
@@ -158,9 +158,10 @@ func TestSubscribe(t *testing.T) {
 
 	for _, tc := range cases {
 		subConfig := messaging.SubscriberConfig{
-			ID:      clientID,
-			Topic:   "channels." + tc.chanID + "." + subTopic,
-			Handler: c,
+			ID:       clientID,
+			Topic:    "channels." + tc.chanID + "." + subTopic,
+			ClientID: clientID,
+			Handler:  c,
 		}
 		clientsCall := clients.On("Authenticate", mock.Anything, &grpcClientsV1.AuthnReq{ClientSecret: tc.clientKey}).Return(tc.authNRes, tc.authNErr)
 		channelsCall := channels.On("Authorize", mock.Anything, &grpcChannelsV1.AuthzReq{