diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
index 7daab0a..08c19ad 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@@ -1142,8 +1142,6 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 
 		try{
 
-			ArrayList<EnhancedFeed> toReturn = new ArrayList<EnhancedFeed>();
-
 			// get reference time
 			Calendar oneYearAgo = Calendar.getInstance();
 			oneYearAgo.set(Calendar.YEAR, oneYearAgo.get(Calendar.YEAR) - 1);
@@ -1178,7 +1176,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 						feedsIteratorComments.remove();
 				}
 				break;
-			default : return toReturn;
+			default : return new ArrayList<EnhancedFeed>();
 			}
 
 			// filter the feeds according the current context
@@ -1197,6 +1195,8 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 			}
 
 			// enhance retrieved feeds
+			int upperIndex = (from + quantity) >= feeds.size() ? feeds.size() - 1 : from + quantity;
+			feeds = (ArrayList<Feed>) feeds.subList(from, upperIndex);
 			Collections.sort(feeds, Collections.reverseOrder());
 			return enhanceFeeds(feeds, -1);