diff --git a/src/main/resources/META-INF/orm.xml b/src/main/resources/META-INF/orm.xml
index d288233d..368beb8d 100644
--- a/src/main/resources/META-INF/orm.xml
+++ b/src/main/resources/META-INF/orm.xml
@@ -6,7 +6,7 @@
         http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
         
 	<named-query name="EntryStatus.unreadCounts">
-		<query>select sub.id, count(s) from FeedEntryStatus s LEFT JOIN s.subscription sub where sub.user=:user and s.read=false group by sub.id</query>
+		<query>select s.subscription.id, count(s) from FeedEntryStatus s where s.user=:user and s.read=false group by s.subscription.id</query>
 	</named-query>
 	
 	<named-query name="EntryStatus.existing">
diff --git a/src/main/resources/changelogs/db.changelog-1.1.xml b/src/main/resources/changelogs/db.changelog-1.1.xml
index 21ce607c..ee98620e 100644
--- a/src/main/resources/changelogs/db.changelog-1.1.xml
+++ b/src/main/resources/changelogs/db.changelog-1.1.xml
@@ -339,4 +339,11 @@
 		</createIndex>
 	</changeSet>
 	
+	<changeSet author="athou" id="create-count-index">
+		<createIndex indexName="user_read_sub_index" tableName="FEEDENTRYSTATUSES">
+			<column name="user_id" />
+			<column name="read_status" />
+			<column name="subscription_id" />
+		</createIndex>
+	</changeSet>
 </databaseChangeLog>