diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
index d77b77f9eaca028099b095ee942c702c67bfacfe..71e78716a52bf90ceea9e663b2db35dad5a6f7d4 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
@@ -1019,14 +1019,16 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
 				}
 			}
 		}
-		
+
 		if(dataModel instanceof FilterableFlexiTableModel) {
 			rowCount = -1;
 			currentPage = 0;
+			doUnSelectAll();
 			((FilterableFlexiTableModel)dataModel).filter(selectedFilters);
 		} else if(dataSource != null) {
 			rowCount = -1;
 			currentPage = 0;
+			doUnSelectAll();
 			dataSource.clear();
 			dataSource.load(null, selectedFilters, null, 0, getPageSize(), orderBy);
 		}
@@ -1037,6 +1039,7 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
 		if(dataSource != null) {
 			rowCount = -1;
 			currentPage = 0;
+			doUnSelectAll();
 
 			List<FlexiTableFilter> selectedFilters = new ArrayList<>(extendedFilters);
 			dataSource.clear();