diff --git a/client/src/test/java/dev/fitko/fitconnect/client/ClientIntegrationTest.java b/client/src/test/java/dev/fitko/fitconnect/client/ClientIntegrationTest.java
index 34852f52a0f8178c870df7924b0ca5bd976b139f..dcdf68c90b4be23a2cf604280601063ad0762867 100644
--- a/client/src/test/java/dev/fitko/fitconnect/client/ClientIntegrationTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/ClientIntegrationTest.java
@@ -333,7 +333,7 @@ class ClientIntegrationTest {
                 final List<Event> senderEvents = senderEventLog.stream().map(EventLogEntry::getEvent).collect(Collectors.toList());
 
                 // Then
-                return senderEvents.equals(List.of(Event.CREATE, Event.SUBMIT, Event.NOTIFY));
+                return senderEvents.equals(List.of(Event.CREATE, Event.SUBMIT));
             });
         }
 
@@ -370,7 +370,7 @@ class ClientIntegrationTest {
                 final List<Event> subscriberEvents = subscriberEventLog.stream().map(EventLogEntry::getEvent).collect(Collectors.toList());
 
                 // Then
-                return subscriberEvents.equals(List.of(Event.CREATE, Event.SUBMIT, Event.NOTIFY));
+                return subscriberEvents.equals(List.of(Event.CREATE, Event.SUBMIT));
             });
         }
 
diff --git a/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
index 6459fffbe986a8ead1dee6590d4afc0b09a42dba..1f5e8171c977b6872ee8ab8839e0e54c9ff269f6 100644
--- a/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
@@ -109,9 +109,7 @@ public class DefaultValidationService implements ValidationService {
     @Override
     public ValidationResult validateMetadataSchema(final Metadata metadata) {
 
-        if (metadata.getSchema() == null || metadata.getSchema().isEmpty()) {
-            return ValidationResult.ok();
-        } else if (!metadata.getSchema().matches(VALID_SCHEMA_URL_EXPRESSION)) {
+        if (metadata.getSchema() != null && !metadata.getSchema().isEmpty() && !metadata.getSchema().matches(VALID_SCHEMA_URL_EXPRESSION)) {
             return ValidationResult.error(new ValidationException("The provided metadata schema is not supported."));
         }
 
diff --git a/core/src/test/java/dev/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java b/core/src/test/java/dev/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
index ed542d5d53da7c2a98758c9ae57329fd55e8e94e..0bbf98f418326eccdbeba3d5b644748e91faa050 100644
--- a/core/src/test/java/dev/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
+++ b/core/src/test/java/dev/fitko/fitconnect/core/validation/DefaultValidationServiceTest.java
@@ -202,9 +202,15 @@ class DefaultValidationServiceTest {
     }
 
     @Test
-    void validateMetadataWithoutSchemaAttribute() {
+    void validateMetadataWithoutSchemaAttributeButValidSchema() {
 
-        assertTrue(this.underTest.validateMetadataSchema(new Metadata()).isValid());
+        final var contentStructure = new ContentStructure();
+        contentStructure.setAttachments(Collections.emptyList());
+
+        final var metadata = new Metadata();
+        metadata.setContentStructure(contentStructure);
+
+        assertTrue(this.underTest.validateMetadataSchema(metadata).isValid());
     }
 
     @Test
diff --git a/pom.xml b/pom.xml
index 613572b2c212be03525ed505b5e69c6557926a31..99d0c4147b80c376678c2061466b31c05713b915 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,21 +59,22 @@
         <jwk-validator.version>1.4.0</jwk-validator.version>
 
         <!-- 3rd party dependencies -->
-        <nimbus.version>9.29</nimbus.version>
-        <jackson-databind.version>2.14.1</jackson-databind.version>
-        <jackson-annotations.version>2.14.1</jackson-annotations.version>
-        <lombock.version>1.18.24</lombock.version>
+
+        <nimbus.version>9.30.1</nimbus.version>
+        <jackson-databind.version>2.14.2</jackson-databind.version>
+        <jackson-annotations.version>2.14.2</jackson-annotations.version>
+        <lombock.version>1.18.26</lombock.version>
         <logback.version>1.4.5</logback.version>
         <slf4j.version>2.0.6</slf4j.version>
         <jcommander.version>1.82</jcommander.version>
-        <apache-tika.version>2.6.0</apache-tika.version>
+        <apache-tika.version>2.7.0</apache-tika.version>
         <spring-web.version>5.3.25</spring-web.version>
         <snakeyaml.version>1.33</snakeyaml.version>
         <open-csv.version>5.7.1</open-csv.version>
         <json-schema-validator.version>1.0.76</json-schema-validator.version>
 
         <junit.version>5.9.2</junit.version>
-        <mockito.version>5.0.0</mockito.version>
+        <mockito.version>5.1.1</mockito.version>
         <wiremock.version>2.27.2</wiremock.version>
         <hamcrest.version>1.3</hamcrest.version>
         <awaitility-version>4.2.0</awaitility-version>