diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
index 42a525be..2dfb0e61 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
@@ -308,6 +308,9 @@ public class FeedREST extends AbstractResourceREST {
 			return Response.status(Status.NOT_FOUND).build();
 		}
 		Long unreadCount = feedSubscriptionService.getUnreadCount(getUser()).get(id);
+		if (unreadCount == null) {
+			unreadCount = new Long(0);
+		}
 		return Response.ok(
 				Subscription.build(sub, applicationSettingsService.get()
 						.getPublicUrl(), unreadCount)).build();