diff --git a/src/rt/gtfsrt_update.cc b/src/rt/gtfsrt_update.cc
index e8e09c5e..e5b83402 100644
--- a/src/rt/gtfsrt_update.cc
+++ b/src/rt/gtfsrt_update.cc
@@ -268,58 +268,49 @@ statistics gtfsrt_update_msg(timetable const& tt,
   span->SetAttribute("nigiri.gtfsrt.total_entities", msg.entity_size());
 
   for (auto const& entity : msg.entity()) {
-    bool skip = false;
-    if (uint8_t count = entity.has_alert() + entity.has_trip_update() +
-                        entity.has_vehicle();
-        count > 1U) {
-      log(log_lvl::error, "rt.gtfs.unsupported",
-          R"(message has multiple of "trip_update", "vehicle" and "alert" set. This is discouraged by the spec (https://gtfs.org/documentation/realtime/reference/#message-feedentity) (tag={}, id={}))",
-          tag, entity.id());
-    }
-    // no continue here so we don't skip as long as it also has a trip_update
-    if (entity.has_vehicle()) {
-      log(log_lvl::error, "rt.gtfs.unsupported",
-          R"(ignoring unsupported "vehicle" field (tag={}, id={}))", tag,
-          entity.id());
-      ++stats.unsupported_vehicle_;
-    }
-    // no continue here so we don't skip as long as it also has a trip_update
-    if (entity.has_alert()) {
-      log(log_lvl::error, "rt.gtfs.unsupported",
-          R"(ignoring unsupported "alert" field (tag={}, id={}))", tag,
-          entity.id());
-      ++stats.unsupported_alert_;
-    }
-    if (entity.has_is_deleted() && entity.is_deleted()) {
-      log(log_lvl::error, "rt.gtfs.unsupported",
-          R"(unsupported "id_deleted" field (tag={}, id={}), skipping message)",
-          tag, entity.id());
-      ++stats.unsupported_deleted_;
-      skip = true;
-    }
+    auto const unsupported = [&](bool const is_set, char const* field,
+                                 int& stat) {
+      if (is_set) {
+        log(log_lvl::error, "rt.gtfs.unsupported",
+            R"(ignoring unsupported "{}" field (tag={}, id={}))", field, tag,
+            entity.id());
+        ++stat;
+      }
+    };
+
+    unsupported(entity.has_vehicle(), "vehicle", stats.unsupported_vehicle_);
+    unsupported(entity.has_alert(), "alert", stats.unsupported_alert_);
+    unsupported(entity.has_is_deleted() && entity.is_deleted(), "deleted",
+                stats.unsupported_deleted_);
+
     if (!entity.has_trip_update()) {
       log(log_lvl::error, "rt.gtfs.unsupported",
           R"(unsupported: no "trip_update" field (tag={}, id={}), skipping message)",
           tag, entity.id());
       ++stats.no_trip_update_;
-      skip = true;
+      continue;
     }
+
     if (!entity.trip_update().has_trip()) {
       log(log_lvl::error, "rt.gtfs.unsupported",
           R"(unsupported: no "trip" field in "trip_update" field (tag={}, id={}), skipping message)",
           tag, entity.id());
       ++stats.trip_update_without_trip_;
       continue;
-    } else if (!entity.trip_update().trip().has_trip_id()) {
+    }
+
+    if (!entity.trip_update().trip().has_trip_id()) {
       log(log_lvl::error, "rt.gtfs.unsupported",
           R"(unsupported: no "trip_id" field in "trip_update.trip" (tag={}, id={}), skipping message)",
           tag, entity.id());
       ++stats.unsupported_no_trip_id_;
-      skip = true;
-    } else if (entity.trip_update().trip().schedule_relationship() !=
-                   gtfsrt::TripDescriptor_ScheduleRelationship_SCHEDULED &&
-               entity.trip_update().trip().schedule_relationship() !=
-                   gtfsrt::TripDescriptor_ScheduleRelationship_CANCELED) {
+      continue;
+    }
+
+    if (entity.trip_update().trip().schedule_relationship() !=
+            gtfsrt::TripDescriptor_ScheduleRelationship_SCHEDULED &&
+        entity.trip_update().trip().schedule_relationship() !=
+            gtfsrt::TripDescriptor_ScheduleRelationship_CANCELED) {
       log(log_lvl::error, "rt.gtfs.unsupported",
           "unsupported schedule relationship {} (tag={}, id={}), skipping "
           "message",
@@ -327,10 +318,6 @@ statistics gtfsrt_update_msg(timetable const& tt,
               entity.trip_update().trip().schedule_relationship()),
           tag, entity.id());
       ++stats.unsupported_schedule_relationship_;
-      skip = true;
-    }
-
-    if (skip) {
       continue;
     }