diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/PickupDropOffTypeValidator.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/PickupDropOffTypeValidator.java
index 20eb1dc68a..360d3c71c6 100644
--- a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/PickupDropOffTypeValidator.java
+++ b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/PickupDropOffTypeValidator.java
@@ -42,6 +42,12 @@ public void validate(GtfsStopTime entity, NoticeContainer noticeContainer) {
     }
   }
 
+  @Override
+  public boolean shouldCallValidate(ColumnInspector header) {
+    return header.hasColumn(GtfsStopTime.PICKUP_TYPE_FIELD_NAME)
+        && header.hasColumn(GtfsStopTime.DROP_OFF_TYPE_FIELD_NAME);
+  }
+
   /**
    * pickup_drop_off_window fields are forbidden when the pickup_type is regularly scheduled (0) or
    * must be coordinated with the driver (3).