diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
index 2c8c50aa2..78266ad8f 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
@@ -900,7 +900,7 @@ public class RepositoryRestController
                                                                        linkedEntity,
                                                                        linkedRepoMeta.entityMetadata(),
                                                                        baseUri);
-            URI selfUri = addSelfLink(baseUri, entityDto, repository, id);
+            URI selfUri = addSelfLink(baseUri, entityDto, linkedRepoMeta.name(), linkedId);
 
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Location", selfUri.toString());