diff --git a/apigateway/src/main/resources/application.yml b/apigateway/src/main/resources/application.yml
index d2d94f9..60614c8 100644
--- a/apigateway/src/main/resources/application.yml
+++ b/apigateway/src/main/resources/application.yml
@@ -29,9 +29,9 @@ spring:
       routes:
         - id: iot-service
           order: -10
-          uri: lb://iot-service
+          uri: http://iot-service:8082
           predicates:
-            - Path=/api/iot/**
+            - Path=/api/sensordata/**
           filters:
             - StripPrefix=0
 
diff --git a/mainservice/src/main/java/com/example/mainservice/service/PatientService.java b/mainservice/src/main/java/com/example/mainservice/service/PatientService.java
index 0a6c1d3..62695f6 100644
--- a/mainservice/src/main/java/com/example/mainservice/service/PatientService.java
+++ b/mainservice/src/main/java/com/example/mainservice/service/PatientService.java
@@ -185,6 +185,8 @@ public PatientDTO updatePatient(Long Id, PatientDTO dto) {
             p.setChronicConditions(dto.getChronicConditions());
         if (dto.getEmergencyNotes() != null)
             p.setEmergencyNotes(dto.getEmergencyNotes());
+        if (dto.getDeviceId() != null)
+            p.setDeviceId(dto.getDeviceId().isBlank() ? null : dto.getDeviceId());
 
         Patient updatedPatient = patientrepo.save(p);