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 97b1e526..20afdf74 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
@@ -218,6 +218,9 @@ public class FeedREST extends AbstractResourceREST {
 
 		Preconditions.checkNotNull(id);
 		FeedSubscription sub = feedSubscriptionDAO.findById(getUser(), id);
+		if (sub == null) {
+			return Response.status(Status.NOT_FOUND).build();
+		}
 		return Response.ok(Subscription.build(sub, 0)).build();
 	}