diff --git a/xbout/load.py b/xbout/load.py
index d28f1ed..1e43587 100644
--- a/xbout/load.py
+++ b/xbout/load.py
@@ -175,7 +175,26 @@ def open_boutdataset(
         ds = _add_options(ds, inputfilepath)
 
         # If geometry was set, apply geometry again
-        if "geometry" in ds.attrs:
+        if geometry is not None:
+            if "geometry" != ds.attrs.get("geometry", None):
+                warn(
+                    f'open_boutdataset() called with geometry="{geometry}", but we are '
+                    f"reloading a Dataset that was saved after being loaded with "
+                    f'geometry="{ds.attrs.get("geometry", None)}". Applying '
+                    f'geometry="{geometry}" from the argument.'
+                )
+            if gridfilepath is not None:
+                grid = _open_grid(
+                    gridfilepath,
+                    chunks=chunks,
+                    keep_xboundaries=keep_xboundaries,
+                    keep_yboundaries=keep_yboundaries,
+                    mxg=ds.metadata["MXG"],
+                )
+            else:
+                grid = None
+            ds = geometries.apply_geometry(ds, geometry, grid=grid)
+        elif "geometry" in ds.attrs:
             ds = geometries.apply_geometry(ds, ds.attrs["geometry"])
         else:
             ds = geometries.apply_geometry(ds, None)

diff --git a/xbout/tests/test_boutdataset.py b/xbout/tests/test_boutdataset.py
index 2587e17..15b0526 100644
--- a/xbout/tests/test_boutdataset.py
+++ b/xbout/tests/test_boutdataset.py
@@ -1378,20 +1378,12 @@ class TestSave:
 
     @pytest.mark.parametrize("geometry", [None, "toroidal"])
     def test_reload_all(self, tmpdir_factory, bout_xyt_example_files, geometry):
-        if geometry is not None:
-            grid = "grid"
-        else:
-            grid = None
-
         # Create data
         path = bout_xyt_example_files(
-            tmpdir_factory, nxpe=4, nype=5, nt=1, grid=grid, write_to_disk=True
+            tmpdir_factory, nxpe=4, nype=5, nt=1, grid="grid", write_to_disk=True
         )
 
-        if grid is not None:
-            gridpath = str(Path(path).parent) + "/grid.nc"
-        else:
-            gridpath = None
+        gridpath = str(Path(path).parent) + "/grid.nc"
 
         # Load it as a boutdataset
         if geometry is None:
@@ -1400,14 +1392,14 @@ class TestSave:
                     datapath=path,
                     inputfilepath=None,
                     geometry=geometry,
-                    gridfilepath=gridpath,
+                    gridfilepath=None if geometry is None else gridpath,
                 )
         else:
             original = open_boutdataset(
                 datapath=path,
                 inputfilepath=None,
                 geometry=geometry,
-                gridfilepath=gridpath,
+                gridfilepath=None if geometry is None else gridpath,
             )
 
         # Save it to a netCDF file
@@ -1419,6 +1411,25 @@ class TestSave:
 
         xrt.assert_identical(original.load(), recovered.load())
 
+        # Check if we can load with a different geometry argument
+        for reload_geometry in [None, "toroidal"]:
+            if reload_geometry is None or geometry == reload_geometry:
+                recovered = open_boutdataset(
+                    savepath,
+                    geometry=reload_geometry,
+                    gridfilepath=None if reload_geometry is None else gridpath,
+                )
+                xrt.assert_identical(original.load(), recovered.load())
+            else:
+                # Expect a warning because we change the geometry
+                print("here", gridpath)
+                with pytest.warns(UserWarning):
+                    recovered = open_boutdataset(
+                        savepath, geometry=reload_geometry, gridfilepath=gridpath
+                    )
+                # Datasets won't be exactly the same because different geometry was
+                # applied
+
     @pytest.mark.parametrize("save_dtype", [np.float64, np.float32])
     @pytest.mark.parametrize(
         "separate_vars", [False, pytest.param(True, marks=pytest.mark.long)]

`geometry` ignored when reloading an xBOUT-saved Dataset
open_boutdadaset() requires the option geometry="toroidal", etc. to put zShift array in the coordinates. Otherwise it prevents other manipulations on the data, such as bout.to_field_aligned().
xbout/tests/test_boutdataset.py::TestSave::test_reload_all[None]
xbout/tests/test_boutdataset.py::TestBoutDatasetIsXarrayDataset::test_concat xbout/tests/test_boutdataset.py::TestBoutDatasetIsXarrayDataset::test_isel xbout/tests/test_boutdataset.py::TestBoutDatasetMethods::test_remove_yboundaries[2-0] xbout/tests/test_boutdataset.py::TestBoutDatasetMethods::test_set_parallel_interpolation_factor xbout/tests/test_boutdataset.py::TestBoutDatasetMethods::test_interpolate_from_unstructured xbout/tests/test_boutdataset.py::TestBoutDatasetMethods::test_interpolate_from_unstructured_unstructured_output xbout/tests/test_boutdataset.py::TestSave::test_save_all xbout/tests/test_boutdataset.py::TestSave::test_reload_all[toroidal] xbout/tests/test_boutdataset.py::TestSave::test_save_dtype[False-float64] xbout/tests/test_boutdataset.py::TestSave::test_save_dtype[False-float32] xbout/tests/test_boutdataset.py::TestSave::test_save_separate_variables xbout/tests/test_boutdataset.py::TestSave::test_reload_separate_variables[None] xbout/tests/test_boutdataset.py::TestSave::test_reload_separate_variables[toroidal] xbout/tests/test_boutdataset.py::TestSave::test_reload_separate_variables_time_split[None] xbout/tests/test_boutdataset.py::TestSave::test_reload_separate_variables_time_split[toroidal] xbout/tests/test_boutdataset.py::TestSaveRestart::test_to_restart[None] xbout/tests/test_boutdataset.py::TestSaveRestart::test_to_restart_change_npe