diff --git a/projects/roctracer/src/core/loader.h b/projects/roctracer/src/core/loader.h
index 92bee42257..279b365175 100644
--- a/projects/roctracer/src/core/loader.h
+++ b/projects/roctracer/src/core/loader.h
@@ -121,8 +121,8 @@ class HccLoader : protected Loader {
 // KFD runtime library loader class
 class KfdLoader : protected Loader {
   public:
-  typedef void (*RegisterApiCallback_t)(roctracer_rtapi_callback_t);
-  typedef void (*RemoveApiCallback_t)();
+  typedef bool (RegisterApiCallback_t)(uint32_t op, void* callback, void* arg);
+  typedef bool (RemoveApiCallback_t)(uint32_t op);
 
   static KfdLoader& Instance() {
     KfdLoader* obj = instance_.load(std::memory_order_acquire);
diff --git a/projects/roctracer/src/core/roctracer.cpp b/projects/roctracer/src/core/roctracer.cpp
index 1475560e4e..0286c10e05 100644
--- a/projects/roctracer/src/core/roctracer.cpp
+++ b/projects/roctracer/src/core/roctracer.cpp
@@ -530,7 +530,7 @@ static void roctracer_enable_callback_impl(
   switch (domain) {
 #if 0
     case ACTIVITY_DOMAIN_KFD_API: {
-      bool succ = roctracer::HipLoader::Instance().RegisterApiCallback(op, (void*)callback, user_data);
+      const bool succ = roctracer::KfdLoader::Instance().RegisterApiCallback(op, (void*)callback, user_data);
       if (succ == false) EXC_RAISING(ROCTRACER_STATUS_ERROR, "KFD RegisterApiCallback error");
       break;
     }
@@ -591,6 +591,13 @@ static void roctracer_disable_callback_impl(
     uint32_t op)
 {
   switch (domain) {
+#if 0
+    case ACTIVITY_DOMAIN_KFD_API: {
+      const bool succ = roctracer::KfdLoader::Instance().RemoveApiCallback(op);
+      if (succ == false) EXC_RAISING(ROCTRACER_STATUS_ERROR, "KFD RemoveApiCallback error");
+      break;
+    }
+#endif
     case ACTIVITY_DOMAIN_HSA_OPS: break;
     case ACTIVITY_DOMAIN_HSA_API: break;
     case ACTIVITY_DOMAIN_HCC_OPS: break;