diff --git a/src/fondant/component/data_io.py b/src/fondant/component/data_io.py
index f3ec2d22..91ea797a 100644
--- a/src/fondant/component/data_io.py
+++ b/src/fondant/component/data_io.py
@@ -200,12 +200,6 @@ def _write_dataframe(self, dataframe: dd.DataFrame) -> None:
             columns=dataframe.columns,
         )
 
-        if len(set(location)) > 1:
-            msg = "Writing to multiple locations is currently not supported."
-            raise ValueError(
-                msg,
-            )
-
         output_location_path = location[0]
 
         # Create directory the dataframe will be written to, since this is not handled by Pandas
diff --git a/src/fondant/core/manifest.py b/src/fondant/core/manifest.py
index ba86cbc3..eeaad518 100644
--- a/src/fondant/core/manifest.py
+++ b/src/fondant/core/manifest.py
@@ -299,16 +299,15 @@ def evolve_manifest_index_and_field_locations(  # noqa PLR0913
     ):
         """Evolve the manifest index and field locations based on the component spec."""
         # Update index location as this is always rewritten
-        # TODO: handle index location - do we have to update/rewrite the index to the new location?
         if working_dir:
-            field = Field.create(
+            index = Field.create(
                 name="index",
                 working_dir=working_dir,
                 run_id=run_id,
                 component_id=component_id,
                 dataset_name=self.dataset_name,
             )
-            evolved_manifest.add_or_update_field(field, overwrite=False)
+            evolved_manifest.add_or_update_field(index, overwrite=False)
 
         # Remove all previous fields if the component changes the index
         if operation_spec.previous_index: