diff --git a/plugin/ctf/plugin.cpp b/plugin/ctf/plugin.cpp
index c060ecc766..eced9a565e 100644
--- a/plugin/ctf/plugin.cpp
+++ b/plugin/ctf/plugin.cpp
@@ -155,8 +155,10 @@ class HsaApiEventRecord : public TracerEventRecord<barectf_hsa_api_ctx> {
   explicit HsaApiEventRecord(const rocprofiler_record_tracer_t& record,
                              const rocprofiler_session_id_t session_id,
                              const std::uint64_t clock_val)
-      : TracerEventRecord<barectf_hsa_api_ctx>{record, clock_val},
-        api_data_{*(record.api_data.hsa)} {}
+      : TracerEventRecord<barectf_hsa_api_ctx>{record, clock_val} {
+          if(record.api_data.hsa)
+            api_data_ = *(record.api_data.hsa);
+        }
   explicit HsaApiEventRecord(const rocprofiler_record_tracer_t& record,
                              const std::uint64_t clock_val, hsa_api_data_t& api_data)
       : TracerEventRecord<barectf_hsa_api_ctx>{record, clock_val}, api_data_(api_data) {}
@@ -204,8 +206,8 @@ class HipApiEventRecord : public TracerEventRecord<barectf_hip_api_ctx> {
                              const rocprofiler_session_id_t session_id,
                              const std::uint64_t clock_val)
       : TracerEventRecord<barectf_hip_api_ctx>{record, clock_val},
-        api_data_{*(record.api_data.hip)},
-        kernel_name_{nullptr} {}
+        api_data_{record.api_data.hip? *(record.api_data.hip) : hip_api_data_t{}},
+        kernel_name_{record.name ? record.name : std::string{}} {}
   explicit HipApiEventRecord(const rocprofiler_record_tracer_t& record,
                              const std::uint64_t clock_val, hip_api_data_t& api_data,
                              std::string kernel_name)
diff --git a/src/tools/tool.cpp b/src/tools/tool.cpp
index 7b1e1f8749..d1519c6acd 100644
--- a/src/tools/tool.cpp
+++ b/src/tools/tool.cpp
@@ -741,8 +741,6 @@ ROCPROFILER_EXPORT bool OnLoad(void* table, uint64_t runtime_version, uint64_t f
                                                     rocprofiler_filter_data_t{&apis_requested[0]},
                                                     apis_requested.size(), &filter_id, property));
         CHECK_ROCPROFILER(rocprofiler_set_filter_buffer(session_id, filter_id, buffer_id));
-        CHECK_ROCPROFILER(rocprofiler_set_api_trace_sync_callback(session_id, filter_id,
-                                                                  sync_api_trace_callback));
         filter_ids.emplace_back(filter_id);
         break;
       }