diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HivePageSource.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HivePageSource.java
index 324c3fc55..1a515cf72 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/HivePageSource.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/HivePageSource.java
@@ -307,6 +307,7 @@ public class HivePageSource
 
     private List<Map<Integer, ColumnHandle>> getEligibleColumnsForRowFiltering(int channelCount, List<Map<ColumnHandle, DynamicFilter>> dynamicFilters)
     {
+        boolean eligibleFilterFound = false;
         List<Map<Integer, ColumnHandle>> eligibleColumnsList = new ArrayList<>();
         for (Map<ColumnHandle, DynamicFilter> dynamicFilter : dynamicFilters) {
             Map<Integer, ColumnHandle> eligibleColumns = new HashMap<>();
@@ -319,8 +320,15 @@ public class HivePageSource
                 }
             }
 
+            if (eligibleColumns.size() > 0) {
+                eligibleFilterFound = true;
+            }
             eligibleColumnsList.add(eligibleColumns);
         }
+
+        if (eligibleFilterFound == false) {
+            return new ArrayList<>();
+        }
         return eligibleColumnsList;
     }