diff --git a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
index 2c8c942ba3..7fee411704 100644
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
@@ -351,7 +351,7 @@ public class DefaultTransportApiService implements TransportApiService {
                 device.setAdditionalInfo(additionalInfo);
                 device = deviceService.saveDevice(device);
 
-                relationService.saveRelation(TenantId.SYS_TENANT_ID, new EntityRelation(gateway.getId(), device.getId(), "Created"));
+                relationService.saveRelation(tenantId, new EntityRelation(gateway.getId(), device.getId(), "Created"));
 
                 TbMsgMetaData metaData = new TbMsgMetaData();
                 CustomerId customerId = gateway.getCustomerId();