1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/hle/service/time/standard_user_system_clock_core.cpp b/src/core/hle/service/time/standard_user_system_clock_core.cpp
index ef79ab917..e94220a44 100644
--- a/src/core/hle/service/time/standard_user_system_clock_core.cpp
+++ b/src/core/hle/service/time/standard_user_system_clock_core.cpp
@@ -4,6 +4,7 @@
 
 #include "common/assert.h"
 #include "core/core.h"
+#include "core/hle/kernel/k_event.h"
 #include "core/hle/service/time/standard_local_system_clock_core.h"
 #include "core/hle/service/time/standard_network_system_clock_core.h"
 #include "core/hle/service/time/standard_user_system_clock_core.h"
@@ -16,10 +17,15 @@ StandardUserSystemClockCore::StandardUserSystemClockCore(
     : SystemClockCore(local_system_clock_core_.GetSteadyClockCore()),
       local_system_clock_core{local_system_clock_core_},
       network_system_clock_core{network_system_clock_core_},
-      auto_correction_time{SteadyClockTimePoint::GetRandom()}, auto_correction_event{
-                                                                   system_.Kernel()} {
-    Kernel::KAutoObject::Create(std::addressof(auto_correction_event));
-    auto_correction_event.Initialize("StandardUserSystemClockCore:AutoCorrectionEvent");
+      auto_correction_time{SteadyClockTimePoint::GetRandom()}, service_context{
+                                                                   system_,
+                                                                   "StandardUserSystemClockCore"} {
+    auto_correction_event =
+        service_context.CreateEvent("StandardUserSystemClockCore:AutoCorrectionEvent");
+}
+
+StandardUserSystemClockCore::~StandardUserSystemClockCore() {
+    service_context.CloseEvent(auto_correction_event);
 }
 
 ResultCode StandardUserSystemClockCore::SetAutomaticCorrectionEnabled(Core::System& system,