diff --git a/include/sdbusplus/async/server.hpp b/include/sdbusplus/async/server.hpp
index 43d023b..2a3a960 100644
--- a/include/sdbusplus/async/server.hpp
+++ b/include/sdbusplus/async/server.hpp
@@ -44,10 +44,10 @@
  */
 struct server_context_friend
 {
-    template <typename T>
-    sdbusplus::async::context& context()
+    template <typename Client, typename Self>
+    static sdbusplus::async::context& context(Self* self)
     {
-        return static_cast<T*>(this)->ctx;
+        return static_cast<Client*>(self)->ctx;
     }
 };
 
diff --git a/tools/sdbusplus/templates/interface.aserver.hpp.mako b/tools/sdbusplus/templates/interface.aserver.hpp.mako
index 0c10273..7592c82 100644
--- a/tools/sdbusplus/templates/interface.aserver.hpp.mako
+++ b/tools/sdbusplus/templates/interface.aserver.hpp.mako
@@ -94,7 +94,8 @@
     /** @return the async context */
     sdbusplus::async::context& _context()
     {
-        return server_details::server_context_friend::context<Server>();
+        return server_details::server_context_friend::
+            context<Server, ${interface.classname}>(this);
     }
 
     sdbusplus::server::interface_t