diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index cbce37e..11c2106 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -383,8 +383,12 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             - Checks, if times_port_administration.etd_berth is filled in. 
             - Measures the difference between 'now' and 'times_agency.etd_berth'.
         """
-        # check, if the header is filled in (agency & PORT_ADMINISTRATION)
-        if (len(df_times.loc[df_times["participant_type"]==ParticipantType.AGENCY.value]) != 1) or (len(df_times.loc[df_times["participant_type"]==ParticipantType.PORT_ADMINISTRATION.value]) != 1):
+        if not shipcall.type in [ShipcallType.OUTGOING.value, ShipcallType.SHIFTING.value]:
+            return self.get_no_violation_default_output()
+        
+        # check, if the header is filled in
+        unassigned = self.sql_handler.check_if_any_participant_of_type_is_unassigned(shipcall, *[ParticipantType.AGENCY, ParticipantType.PORT_ADMINISTRATION])
+        if unassigned:
             return self.get_no_violation_default_output()
         
         # preparation: obtain the correct times of the participant, define the query time and the key time