diff --git a/src/main/java/com/commafeed/backend/model/FeedSubscription.java b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
index 92a08cec..e943e1a1 100644
--- a/src/main/java/com/commafeed/backend/model/FeedSubscription.java
+++ b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
@@ -40,7 +40,7 @@ public class FeedSubscription extends AbstractModel {
 
 	private Integer position;
 
-	@Column(length = 4096)
+	@Column(name = "filtering_expression", length = 4096)
 	private String filter;
 
 }
diff --git a/src/main/resources/changelogs/db.changelog-2.6.xml b/src/main/resources/changelogs/db.changelog-2.6.xml
index 23a0a002..f887faa4 100644
--- a/src/main/resources/changelogs/db.changelog-2.6.xml
+++ b/src/main/resources/changelogs/db.changelog-2.6.xml
@@ -23,4 +23,8 @@
 		</addColumn>
 	</changeSet>
 
+	<changeSet id="rename-filter-avoid-keyword" author="athou">
+		<renameColumn tableName="FEEDSUBSCRIPTIONS" oldColumnName="filter" newColumnName="filtering_expression" />
+	</changeSet>
+
 </databaseChangeLog>