diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
index c99273a085038bb424aa64d1341204e6f7273323..4062cf9dfad38b0627b2f834448c6d73d3c6f232 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
@@ -65,7 +65,7 @@ public:
 
     Acts::MagneticFieldContext mctx;
     const ActsGeometryContext& gctx
-      = *m_trackingGeometryTool->getGeometryContext(ctx);
+      = m_trackingGeometryTool->getGeometryContext(ctx);
 
     auto anygctx = gctx.any();
 
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h
index b493317242291eb1a1273faf2243af48cc9b2f9c..d9a9ee1a96f451c98362ea061ddf2afc8ac528e5 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h
@@ -39,7 +39,7 @@ public:
   std::shared_ptr<const Acts::TrackingGeometry>
   trackingGeometry() const;
 
-  const ActsGeometryContext*
+  const ActsGeometryContext&
   getGeometryContext(const EventContext& ctx = Gaudi::Hive::currentContext()) const;
 
   ActsGeometryContext
diff --git a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx
index d3bbc8eb906b3f91314b0ec9db908e41bc11df30..563aeb090ac45b3de2fbc6b0e901e562d093062d 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx
@@ -40,7 +40,7 @@ ActsTrackingGeometryTool::trackingGeometry() const
   return m_trackingGeometrySvc->trackingGeometry();
 }
 
-const ActsGeometryContext*
+const ActsGeometryContext&
 ActsTrackingGeometryTool::getGeometryContext(const EventContext& ctx) const
 {
   ATH_MSG_DEBUG("Creating alignment context for event");
@@ -50,7 +50,7 @@ ActsTrackingGeometryTool::getGeometryContext(const EventContext& ctx) const
     ATH_MSG_ERROR("Creating alignment context failed: read cond handle invalid!");
   }
 
-  return *rch;
+  return **rch;
 }
 
 ActsGeometryContext