diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp b/Source/Core/Core/DSP/Jit/DSPEmitter.cpp
index 323e85ae71..5cbf529c51 100644
--- a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPEmitter.cpp
@@ -75,7 +75,7 @@ void DSPEmitter::DoState(PointerWrap& p)
 
 void DSPEmitter::ClearIRAM()
 {
-  for (int i = 0x0000; i < 0x1000; i++)
+  for (size_t i = 0; i < DSP_IRAM_SIZE; i++)
   {
     m_blocks[i] = (DSPCompiledCode)m_stub_entry_point;
     m_block_links[i] = nullptr;
@@ -91,7 +91,7 @@ void DSPEmitter::ClearIRAMandDSPJITCodespaceReset()
   CompileDispatcher();
   m_stub_entry_point = CompileStub();
 
-  for (int i = 0x0000; i < 0x10000; i++)
+  for (size_t i = 0; i < MAX_BLOCKS; i++)
   {
     m_blocks[i] = (DSPCompiledCode)m_stub_entry_point;
     m_block_links[i] = nullptr;
@@ -339,7 +339,7 @@ void DSPEmitter::Compile(u16 start_addr)
   {
     m_block_links[start_addr] = m_block_link_entry;
 
-    for (u16 i = 0x0000; i < 0xffff; ++i)
+    for (size_t i = 0; i < 0xffff; ++i)
     {
       if (!m_unresolved_jumps[i].empty())
       {
@@ -386,7 +386,7 @@ static void CompileCurrent()
   while (retry)
   {
     retry = false;
-    for (u16 i = 0x0000; i < 0xffff; ++i)
+    for (size_t i = 0; i < 0xffff; ++i)
     {
       if (!g_dsp_jit->m_unresolved_jumps[i].empty())
       {
diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.h b/Source/Core/Core/DSP/Jit/DSPEmitter.h
index fe0d0ccc60..21d30442fb 100644
--- a/Source/Core/Core/DSP/Jit/DSPEmitter.h
+++ b/Source/Core/Core/DSP/Jit/DSPEmitter.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <array>
 #include <cstddef>
 #include <list>
 #include <vector>
@@ -253,7 +254,7 @@ public:
   void madd(const UDSPInstruction opc);
   void msub(const UDSPInstruction opc);
 
-  std::list<u16> m_unresolved_jumps[MAX_BLOCKS];
+  std::array<std::list<u16>, MAX_BLOCKS> m_unresolved_jumps;
 
 private:
   void WriteBranchExit();