diff --git a/Project.toml b/Project.toml
index 8529525b41..b7de074bd9 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "Oceananigans"
 uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
 authors = ["Climate Modeling Alliance and contributors"]
-version = "0.95.1"
+version = "0.95.2"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
diff --git a/src/BoundaryConditions/polar_boundary_condition.jl b/src/BoundaryConditions/polar_boundary_condition.jl
index 2d3cef673d..f9f7ce9189 100644
--- a/src/BoundaryConditions/polar_boundary_condition.jl
+++ b/src/BoundaryConditions/polar_boundary_condition.jl
@@ -1,4 +1,4 @@
-using Oceananigans.Grids: inactive_node, new_data
+using Oceananigans.Grids: inactive_node, new_data, YFlatGrid
 using CUDA: @allowscalar
 
 struct PolarValue{D, S}
@@ -20,6 +20,10 @@ end
 # Just a column
 @inline getbc(pv::BC{<:Value, <:PolarValue}, i, k, args...) = @inbounds pv.condition.data[1, 1, k]
 
+# YFlat grids do not have boundary conditions!
+latitude_north_auxiliary_bc(::YFlatGrid, args...) = nothing
+latitude_south_auxiliary_bc(::YFlatGrid, args...) = nothing
+
 # TODO: vectors should have a different treatment since vector components should account for the frame of reference.
 # For the moment, the `PolarBoundaryConditions` is implemented only for fields that have `loc[1] == loc[2] == Center()`, which
 # we assume are not components of horizontal vectors that would require rotation. (The `w` velocity if not a tracer, but it does