diff --git a/src/query/plan/distributed.cpp b/src/query/plan/distributed.cpp
index fb6d80a32..43c422908 100644
--- a/src/query/plan/distributed.cpp
+++ b/src/query/plan/distributed.cpp
@@ -325,9 +325,7 @@ class DistributedPlanner : public HierarchicalLogicalOperatorVisitor {
 
   bool Visit(Once &) override { return true; }
 
-  bool Visit(CreateIndex &) override {
-    throw utils::NotYetImplemented("distributed planning");
-  }
+  bool Visit(CreateIndex &) override { return true; }
 
   // TODO: Write operators, accumulate and unwind
 
diff --git a/tests/unit/query_planner.cpp b/tests/unit/query_planner.cpp
index d31384d4a..7b35581fa 100644
--- a/tests/unit/query_planner.cpp
+++ b/tests/unit/query_planner.cpp
@@ -1446,6 +1446,9 @@ TYPED_TEST(TestPlanner, CreateIndex) {
   AstTreeStorage storage;
   QUERY(SINGLE_QUERY(CREATE_INDEX_ON(label, property)));
   CheckPlan<TypeParam>(storage, ExpectCreateIndex(label, property));
+  ExpectedDistributedPlan expected{
+      MakeCheckers(ExpectCreateIndex(label, property)), {}};
+  CheckDistributedPlan<TypeParam>(storage, expected);
 }
 
 TYPED_TEST(TestPlanner, AtomIndexedLabelProperty) {