diff --git a/Source/Core/Core/Slippi/SlippiNetplay.cpp b/Source/Core/Core/Slippi/SlippiNetplay.cpp
index 22b0779482..b24db96de2 100644
--- a/Source/Core/Core/Slippi/SlippiNetplay.cpp
+++ b/Source/Core/Core/Slippi/SlippiNetplay.cpp
@@ -399,19 +399,19 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
     last_frame_acked[p_idx] = frame > last_frame_acked[p_idx] ? frame : last_frame_acked[p_idx];
 
     // Remove old timings
-    while (!ack_timers[p_idx].empty() && ack_timers[p_idx].front().frame < frame)
+    while (!ack_timers[p_idx].Empty() && ack_timers[p_idx].Front().frame < frame)
     {
-      ack_timers[p_idx].pop();
+      ack_timers[p_idx].Pop();
     }
 
     // Don't get a ping if we do not have the right ack frame
-    if (ack_timers[p_idx].empty() || ack_timers[p_idx].front().frame != frame)
+    if (ack_timers[p_idx].Empty() || ack_timers[p_idx].Front().frame != frame)
     {
       break;
     }
 
-    auto send_time = ack_timers[p_idx].front().time_us;
-    ack_timers[p_idx].pop();
+    auto send_time = ack_timers[p_idx].Front().time_us;
+    ack_timers[p_idx].Pop();
 
     ping_us[p_idx] = Common::Timer::NowUs() - send_time;
     if (g_ActiveConfig.bShowNetPlayPing && frame % SLIPPI_PING_DISPLAY_INTERVAL == 0 && p_idx == 0)
@@ -1072,8 +1072,7 @@ void SlippiNetplayClient::StartSlippiGame()
     last_frame_acked[i] = 0;
 
     // Reset ack timers
-    std::queue<SlippiNetplayClient::FrameTiming> empty;
-    std::swap(ack_timers[i], empty);
+    ack_timers[i].Clear();
   }
 
   is_desync_recovery = false;
@@ -1161,7 +1160,7 @@ void SlippiNetplayClient::SendSlippiPad(std::unique_ptr<SlippiPad> pad)
     FrameTiming send_time;
     send_time.frame = frame;
     send_time.time_us = time;
-    ack_timers[i].emplace(send_time);
+    ack_timers[i].Push(send_time);
   }
 }
 
diff --git a/Source/Core/Core/Slippi/SlippiNetplay.h b/Source/Core/Core/Slippi/SlippiNetplay.h
index 5dbb5a27e3..d3b1f83845 100644
--- a/Source/Core/Core/Slippi/SlippiNetplay.h
+++ b/Source/Core/Core/Slippi/SlippiNetplay.h
@@ -258,7 +258,7 @@ protected:
   int32_t last_frame_acked[SLIPPI_REMOTE_PLAYER_MAX];
   FrameOffsetData frame_offset_data[SLIPPI_REMOTE_PLAYER_MAX];
   FrameTiming last_frame_timing[SLIPPI_REMOTE_PLAYER_MAX];
-  std::array<std::queue<FrameTiming>, SLIPPI_REMOTE_PLAYER_MAX> ack_timers;
+  std::array<Common::SPSCQueue<FrameTiming, false>, SLIPPI_REMOTE_PLAYER_MAX> ack_timers;
 
   SlippiConnectStatus slippi_connect_status = SlippiConnectStatus::NET_CONNECT_STATUS_UNSET;
   std::vector<int> failed_connections;