diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp
index c5a5aba828..e6a9f561b2 100644
--- a/Source/Core/Core/AchievementManager.cpp
+++ b/Source/Core/Core/AchievementManager.cpp
@@ -731,9 +731,9 @@ void AchievementManager::AchievementEventHandler(const rc_runtime_event_t* runti
     m_update_callback();
 }
 
-std::recursive_mutex* AchievementManager::GetLock()
+std::recursive_mutex& AchievementManager::GetLock()
 {
-  return &m_lock;
+  return m_lock;
 }
 
 bool AchievementManager::IsHardcoreModeActive() const
@@ -934,7 +934,7 @@ void* AchievementManager::FilereaderOpenByVolume(const char* path_utf8)
   auto state = std::make_unique<FilereaderState>();
   {
     auto& instance = GetInstance();
-    std::lock_guard lg{*instance.GetLock()};
+    std::lock_guard lg{instance.GetLock()};
     state->volume = std::move(instance.GetLoadingVolume());
   }
   if (!state->volume)
diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h
index e6703bc7cb..923740cd36 100644
--- a/Source/Core/Core/AchievementManager.h
+++ b/Source/Core/Core/AchievementManager.h
@@ -129,7 +129,7 @@ public:
   u32 MemoryPeeker(u32 address, u32 num_bytes, void* ud);
   void AchievementEventHandler(const rc_runtime_event_t* runtime_event);
 
-  std::recursive_mutex* GetLock();
+  std::recursive_mutex& GetLock();
   bool IsHardcoreModeActive() const;
   std::string GetPlayerDisplayName() const;
   u32 GetPlayerScore() const;
diff --git a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
index aaea7cbfcc..9bbec01a9f 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
@@ -62,7 +62,7 @@ AchievementHeaderWidget::AchievementHeaderWidget(QWidget* parent) : QWidget(pare
   m_total->setAlignment(Qt::AlignTop);
   setLayout(m_total);
 
-  std::lock_guard lg{*AchievementManager::GetInstance().GetLock()};
+  std::lock_guard lg{AchievementManager::GetInstance().GetLock()};
   UpdateData();
 }
 
diff --git a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp
index c9a77a7007..13ab205f9c 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp
@@ -25,7 +25,7 @@ AchievementLeaderboardWidget::AchievementLeaderboardWidget(QWidget* parent) : QW
   m_common_layout = new QGridLayout();
 
   {
-    std::lock_guard lg{*AchievementManager::GetInstance().GetLock()};
+    std::lock_guard lg{AchievementManager::GetInstance().GetLock()};
     UpdateData();
   }
 
diff --git a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp
index 9821d6b6c7..39cc36948c 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp
@@ -29,7 +29,7 @@ AchievementProgressWidget::AchievementProgressWidget(QWidget* parent) : QWidget(
   m_common_layout = new QVBoxLayout();
 
   {
-    std::lock_guard lg{*AchievementManager::GetInstance().GetLock()};
+    std::lock_guard lg{AchievementManager::GetInstance().GetLock()};
     UpdateData();
   }
 
diff --git a/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp b/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp
index f179b7fb01..3704884a2b 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp
@@ -75,7 +75,7 @@ void AchievementsWindow::UpdateData()
 {
   {
     auto& instance = AchievementManager::GetInstance();
-    std::lock_guard lg{*instance.GetLock()};
+    std::lock_guard lg{instance.GetLock()};
     const bool is_game_loaded = instance.IsGameLoaded();
 
     m_header_widget->UpdateData();
diff --git a/Source/Core/VideoCommon/OnScreenUI.cpp b/Source/Core/VideoCommon/OnScreenUI.cpp
index 254ff6f2bb..88141736e4 100644
--- a/Source/Core/VideoCommon/OnScreenUI.cpp
+++ b/Source/Core/VideoCommon/OnScreenUI.cpp
@@ -330,7 +330,7 @@ void OnScreenUI::DrawDebugText()
 #ifdef USE_RETRO_ACHIEVEMENTS
 void OnScreenUI::DrawChallenges()
 {
-  std::lock_guard lg{*AchievementManager::GetInstance().GetLock()};
+  std::lock_guard lg{AchievementManager::GetInstance().GetLock()};
   const auto& challenge_icons = AchievementManager::GetInstance().GetChallengeIcons();
   if (challenge_icons.empty())
     return;