diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 514074c2cf..3ed3b5a3c8 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -893,10 +893,12 @@ namespace OpenSim.Region.Physics.OdePlugin
                     if (m_isphysical)
                     {
                         d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land);
-                        d.GeomDisable(prim_geom);
                     }
                     else
+                    {
                         d.GeomSetCollideBits(prim_geom, 0);
+                        d.GeomDisable(prim_geom);
+                    }
                 }
                 else
                 {