diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/RepositoryAwareJacksonModule.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/RepositoryAwareJacksonModule.java
index f691637d4..beac8cb4f 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/RepositoryAwareJacksonModule.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/RepositoryAwareJacksonModule.java
@@ -155,7 +155,7 @@ public class RepositoryAwareJacksonModule extends SimpleModule implements Initia
         }
       }
       if(entityConversionSvc.canConvert(sourceType, Resource.class)) {
-        Set<Link> links = resource.getLinks();
+        List<Link> links = resource.getLinks();
         resource = entityConversionSvc.convert(value, Resource.class);
         resource.add(links);
       }
diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/CustomResource.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/CustomResource.java
index 3d6fc5f31..012d49e9a 100644
--- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/CustomResource.java
+++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/CustomResource.java
@@ -1,7 +1,7 @@
 package org.springframework.data.rest.test.webmvc;
 
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.codehaus.jackson.annotate.JsonAnyGetter;
 import org.codehaus.jackson.annotate.JsonProperty;
@@ -23,7 +23,7 @@ public class CustomResource extends Resource<Map<String, Object>> {
   }
 
   @JsonProperty("_links")
-  @Override public Set<Link> getLinks() {
+  @Override public List<Link> getLinks() {
     return super.getLinks();
   }