diff --git a/dune/geometry/deprecated_topology.hh b/dune/geometry/deprecated_topology.hh
index 9a0fbbcfd055b13eef684ba5e8002b75a00643a7..df34d8799972bf84804a1ac79867502d42201f96 100644
--- a/dune/geometry/deprecated_topology.hh
+++ b/dune/geometry/deprecated_topology.hh
@@ -9,7 +9,8 @@
     // Basic Topology Types
     // --------------------
 
-    struct [[deprecated("Use GeometryTypes::vertex instead.")]] Point
+    // PointDeprecationHelper can be used to prevent a deprecation warning for Point
+    struct PointDeprecationHelper
     {
       static const unsigned int dimension = 0;
       static const unsigned int numCorners = 1;
@@ -19,6 +20,8 @@
       static std::string name () { return "p"; }
     };
 
+    using Point [[deprecated("Use GeometryTypes::vertex instead.")]] = PointDeprecationHelper;
+
 
     template< class BaseTopology >
     struct [[deprecated("Use GeometryTypes::prismaticExtension(GeometryType gt) instead.")]] Prism
@@ -139,7 +142,7 @@
     // IfTopology
     // ----------
 
-    template< template< class > class Operation, int dim, class Topology = Point >
+    template< template< class > class Operation, int dim, class Topology = PointDeprecationHelper >
     struct [[deprecated("Use IfGeometryType instead.")]] IfTopology
     {
       template< class... Args >