diff --git a/pom.xml b/pom.xml
index b3f74f95a..0ff00b5f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <enclave-aws.version>2.1.0</enclave-aws.version>
         <enclave-azure.version>2.1.13</enclave-azure.version>
         <enclave-gcp.version>2.1.0</enclave-gcp.version>
-        <uid2-shared.version>10.1.0</uid2-shared.version>
+        <uid2-shared.version>10.8.0</uid2-shared.version>
         <image.version>${project.version}</image.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
@@ -308,7 +308,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.2.5</version>
                 <configuration>
                     <argLine>${argLine} -Dfile.encoding=${project.build.sourceEncoding}</argLine>
                     <systemProperties>
diff --git a/src/main/java/com/uid2/operator/service/SecureLinkValidatorService.java b/src/main/java/com/uid2/operator/service/SecureLinkValidatorService.java
index 3a630dfe5..9e1d8b85c 100644
--- a/src/main/java/com/uid2/operator/service/SecureLinkValidatorService.java
+++ b/src/main/java/com/uid2/operator/service/SecureLinkValidatorService.java
@@ -46,9 +46,12 @@ public boolean validateRequest(RoutingContext rc, JsonObject requestJsonObject,
                         LOGGER.warn("Path: {} , ClientKey has ServiceId set, but LinkId in request was not authorized. ServiceId: {}, LinkId in request: {}", rc.normalizedPath(), clientKey.getServiceId(), linkId);
                         return false;
                     }
+                    if (serviceLink.isDisabled()) {
+                        LOGGER.warn("Path: {} , ServiceLink {} is disabled", rc.normalizedPath(), linkId);
+                        return false;
+                    }
                     if (!serviceLink.getRoles().contains(role)) {
                         LOGGER.warn("Path: {} , ServiceLink {} does not have role {}", rc.normalizedPath(), linkId, role);
-
                         return false;
                     }
                     Service service = rotatingServiceStore.getService(clientKey.getServiceId());
diff --git a/src/test/java/com/uid2/operator/service/SecureLinkValidatorServiceTest.java b/src/test/java/com/uid2/operator/service/SecureLinkValidatorServiceTest.java
index 68decfb9f..9f8cd8a81 100644
--- a/src/test/java/com/uid2/operator/service/SecureLinkValidatorServiceTest.java
+++ b/src/test/java/com/uid2/operator/service/SecureLinkValidatorServiceTest.java
@@ -67,6 +67,18 @@ void validateRequest_linkIdNotFound_returnsFalse() {
         assertFalse(service.validateRequest(this.routingContext, requestJsonObject, Role.MAPPER));
     }
 
+    @Test
+    void validateRequest_linkIdFoundLinkDisabled_returnsFalse() {
+        this.setClientKey(10);
+        JsonObject requestJsonObject = new JsonObject();
+        requestJsonObject.put(SecureLinkValidatorService.LINK_ID, "999");
+
+        when(this.rotatingServiceLinkStore.getServiceLink(10, "999")).thenReturn(new ServiceLink("999", 10, 100, "testServiceLink", Set.of(Role.MAPPER), true));
+
+        SecureLinkValidatorService service = new SecureLinkValidatorService(this.rotatingServiceLinkStore, this.rotatingServiceStore);
+        assertFalse(service.validateRequest(this.routingContext, requestJsonObject, Role.MAPPER));
+    }
+
     @Test
     void validateRequest_roleNotInServiceLink_returnsFalse() {
         this.setClientKey(10);