diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java
index 3691d8503fc18..dbc48b5f376ad 100644
--- a/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java
+++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/planner/PrestoSparkRddFactory.java
@@ -37,6 +37,7 @@
 import com.facebook.presto.spark.classloader_interface.SerializedTaskInfo;
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.WarningCollector;
+import com.facebook.presto.spi.plan.IndexSourceNode;
 import com.facebook.presto.spi.plan.PartitioningHandle;
 import com.facebook.presto.spi.plan.PlanFragmentId;
 import com.facebook.presto.spi.plan.PlanNode;
@@ -369,7 +370,7 @@ private ListMultimap<Integer, SerializedPrestoSparkTaskSource> createTaskSources
     private static List<PrestoSparkSource> findTableScanNodes(PlanNode node)
     {
         return searchFrom(node)
-                .where(TableScanNode.class::isInstance)
+                .where(n -> n instanceof TableScanNode || n instanceof IndexSourceNode)
                 .findAll().stream().map(t -> new PrestoSparkSource(t.getId(), t)).collect(Collectors.toList());
     }