diff --git a/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java b/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java
index 50fe23bd0ff08c1cd4ba5679c0e21bfbf27d6ad9..3ca3ff75c8364a964807aaca1c8ed3bb8a9e8170 100644
--- a/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java
+++ b/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java
@@ -13,7 +13,6 @@ import lombok.extern.java.Log;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 @Provider
@@ -40,7 +39,7 @@ public class PaginationLinkFilter implements ContainerResponseFilter {
         UriInfo uriInfo = requestContext.getUriInfo();
         Page entity = (Page) responseContext.getEntity();
 
-       if (entity.getPageNumber()>entity.getPageTotal())
+        if (entity.getPageNumber() > entity.getPageTotal())
             throw new WebApplicationException(Response.Status.NOT_FOUND);
 
         //We replace the entity by the content of the page (we remove the envelope).
@@ -76,7 +75,8 @@ public class PaginationLinkFilter implements ContainerResponseFilter {
                     .build());
         }
 
-        responseContext.getHeaders().add("Link", linksList.stream().map(l->l.toString()).collect(Collectors.joining(",")));
+        if (!linksList.isEmpty())
+            responseContext.getHeaders().add("Link", linksList.stream().map(l -> l.toString()).collect(Collectors.joining(",")));
         //We add pagination metadata in the header
         responseContext.getHeaders().add(JAXRS_SAMPLE_TOTAL_COUNT, entity.getElementTotal());
         responseContext.getHeaders().add(JAXRS_SAMPLE_PAGE_COUNT, entity.getPageTotal());