diff --git a/api/entry.go b/api/entry.go
index ea944589..f773bfbf 100644
--- a/api/entry.go
+++ b/api/entry.go
@@ -196,9 +196,12 @@ func (h *handler) fetchContent(w http.ResponseWriter, r *http.Request) {
 	user, err := h.store.UserByID(entry.UserID)
 	if err != nil {
 		json.ServerError(w, r, err)
+		return
 	}
+
 	if user == nil {
 		json.NotFound(w, r)
+		return
 	}
 
 	feedBuilder := storage.NewFeedQueryBuilder(h.store, loggedUserID)