diff --git a/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
index 02d91ac43..846ebc8c4 100644
--- a/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
+++ b/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
@@ -5654,37 +5654,6 @@ void InstallOpcodeHandlers(Context::OperatingMode Mode) {
   };
 #undef OPD
 
-  constexpr std::tuple<uint8_t, uint8_t, FEXCore::X86Tables::OpDispatchPtr> RepModOpTable[] = {
-    {0x10, 2, &OpDispatchBuilder::MOVSSOp},
-    {0x12, 1, &OpDispatchBuilder::VMOVSLDUPOp},
-    {0x16, 1, &OpDispatchBuilder::VMOVSHDUPOp},
-    {0x2A, 1, &OpDispatchBuilder::InsertCVTGPR_To_FPR<4>},
-    {0x2B, 1, &OpDispatchBuilder::MOVVectorNTOp},
-    {0x2C, 1, &OpDispatchBuilder::CVTFPR_To_GPR<4, false>},
-    {0x2D, 1, &OpDispatchBuilder::CVTFPR_To_GPR<4, true>},
-    {0x51, 1, &OpDispatchBuilder::VectorScalarUnaryInsertALUOp<IR::OP_VFSQRTSCALARINSERT, 4>},
-    {0x52, 1, &OpDispatchBuilder::VectorScalarUnaryInsertALUOp<IR::OP_VFRSQRTSCALARINSERT, 4>},
-    {0x53, 1, &OpDispatchBuilder::VectorScalarUnaryInsertALUOp<IR::OP_VFRECPSCALARINSERT, 4>},
-    {0x58, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFADDSCALARINSERT, 4>},
-    {0x59, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFMULSCALARINSERT, 4>},
-    {0x5A, 1, &OpDispatchBuilder::InsertScalar_CVT_Float_To_Float<8, 4>},
-    {0x5B, 1, &OpDispatchBuilder::Vector_CVT_Float_To_Int<4, false, false>},
-    {0x5C, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFSUBSCALARINSERT, 4>},
-    {0x5D, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFMINSCALARINSERT, 4>},
-    {0x5E, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFDIVSCALARINSERT, 4>},
-    {0x5F, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFMAXSCALARINSERT, 4>},
-    {0x6F, 1, &OpDispatchBuilder::MOVVectorUnalignedOp},
-    {0x70, 1, &OpDispatchBuilder::Bind<&OpDispatchBuilder::PSHUFWOp, false>},
-    {0x7E, 1, &OpDispatchBuilder::Bind<&OpDispatchBuilder::MOVQOp, OpDispatchBuilder::VectorOpType::SSE>},
-    {0x7F, 1, &OpDispatchBuilder::MOVVectorUnalignedOp},
-    {0xB8, 1, &OpDispatchBuilder::PopcountOp},
-    {0xBC, 1, &OpDispatchBuilder::TZCNT},
-    {0xBD, 1, &OpDispatchBuilder::LZCNT},
-    {0xC2, 1, &OpDispatchBuilder::InsertScalarFCMPOp<4>},
-    {0xD6, 1, &OpDispatchBuilder::MOVQ2DQ<true>},
-    {0xE6, 1, &OpDispatchBuilder::Vector_CVT_Int_To_Float<4, true>},
-  };
-
   constexpr std::tuple<uint8_t, uint8_t, FEXCore::X86Tables::OpDispatchPtr> RepNEModOpTable[] = {
     {0x10, 2, &OpDispatchBuilder::MOVSDOp},
     {0x12, 1, &OpDispatchBuilder::MOVDDUPOp},
@@ -6666,7 +6635,6 @@ void InstallOpcodeHandlers(Context::OperatingMode Mode) {
 
   InstallToTable(FEXCore::X86Tables::PrimaryInstGroupOps, PrimaryGroupOpTable);
 
-  InstallToTable(FEXCore::X86Tables::RepModOps, RepModOpTable);
   InstallToTable(FEXCore::X86Tables::RepNEModOps, RepNEModOpTable);
   InstallToTable(FEXCore::X86Tables::OpSizeModOps, OpSizeModOpTable);
   InstallToTable(FEXCore::X86Tables::SecondInstGroupOps, SecondaryExtensionOpTable);
diff --git a/FEXCore/Source/Interface/Core/OpcodeDispatcher/SecondaryTables.h b/FEXCore/Source/Interface/Core/OpcodeDispatcher/SecondaryTables.h
index 279cf3378..132a79215 100644
--- a/FEXCore/Source/Interface/Core/OpcodeDispatcher/SecondaryTables.h
+++ b/FEXCore/Source/Interface/Core/OpcodeDispatcher/SecondaryTables.h
@@ -10,7 +10,7 @@ constexpr inline void InstallToTable(auto& FinalTable, auto& LocalTable) {
     for (uint8_t i = 0; i < std::get<1>(Op); ++i) {
       auto& TableOp = FinalTable[OpNum + i];
       if (TableOp.OpcodeDispatcher) {
-        LOGMAN_MSG_A_FMT("Duplicate Entry {} 0x{:x}", TableOp.Name, OpNum+i);
+        LOGMAN_MSG_A_FMT("Duplicate Entry {} 0x{:x}", TableOp.Name, OpNum + i);
       }
 
       TableOp.OpcodeDispatcher = Dispatcher;
@@ -167,6 +167,41 @@ consteval inline void SecondaryTables_Install(auto& FinalTable) {
   InstallToTable(FinalTable, TwoByteOpTable);
 }
 
+consteval inline void SecondaryRepModTables_Install(auto& FinalTable) {
+  constexpr std::tuple<uint8_t, uint8_t, FEXCore::X86Tables::OpDispatchPtr> Table[] = {
+    {0x10, 2, &OpDispatchBuilder::MOVSSOp},
+    {0x12, 1, &OpDispatchBuilder::VMOVSLDUPOp},
+    {0x16, 1, &OpDispatchBuilder::VMOVSHDUPOp},
+    {0x2A, 1, &OpDispatchBuilder::InsertCVTGPR_To_FPR<4>},
+    {0x2B, 1, &OpDispatchBuilder::MOVVectorNTOp},
+    {0x2C, 1, &OpDispatchBuilder::CVTFPR_To_GPR<4, false>},
+    {0x2D, 1, &OpDispatchBuilder::CVTFPR_To_GPR<4, true>},
+    {0x51, 1, &OpDispatchBuilder::VectorScalarUnaryInsertALUOp<IR::OP_VFSQRTSCALARINSERT, 4>},
+    {0x52, 1, &OpDispatchBuilder::VectorScalarUnaryInsertALUOp<IR::OP_VFRSQRTSCALARINSERT, 4>},
+    {0x53, 1, &OpDispatchBuilder::VectorScalarUnaryInsertALUOp<IR::OP_VFRECPSCALARINSERT, 4>},
+    {0x58, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFADDSCALARINSERT, 4>},
+    {0x59, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFMULSCALARINSERT, 4>},
+    {0x5A, 1, &OpDispatchBuilder::InsertScalar_CVT_Float_To_Float<8, 4>},
+    {0x5B, 1, &OpDispatchBuilder::Vector_CVT_Float_To_Int<4, false, false>},
+    {0x5C, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFSUBSCALARINSERT, 4>},
+    {0x5D, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFMINSCALARINSERT, 4>},
+    {0x5E, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFDIVSCALARINSERT, 4>},
+    {0x5F, 1, &OpDispatchBuilder::VectorScalarInsertALUOp<IR::OP_VFMAXSCALARINSERT, 4>},
+    {0x6F, 1, &OpDispatchBuilder::MOVVectorUnalignedOp},
+    {0x70, 1, &OpDispatchBuilder::Bind<&OpDispatchBuilder::PSHUFWOp, false>},
+    {0x7E, 1, &OpDispatchBuilder::Bind<&OpDispatchBuilder::MOVQOp, OpDispatchBuilder::VectorOpType::SSE>},
+    {0x7F, 1, &OpDispatchBuilder::MOVVectorUnalignedOp},
+    {0xB8, 1, &OpDispatchBuilder::PopcountOp},
+    {0xBC, 1, &OpDispatchBuilder::TZCNT},
+    {0xBD, 1, &OpDispatchBuilder::LZCNT},
+    {0xC2, 1, &OpDispatchBuilder::InsertScalarFCMPOp<4>},
+    {0xD6, 1, &OpDispatchBuilder::MOVQ2DQ<true>},
+    {0xE6, 1, &OpDispatchBuilder::Vector_CVT_Int_To_Float<4, true>},
+  };
+
+  InstallToTable(FinalTable, Table);
+}
+
 inline void SecondaryTables_Install64(auto& FinalTable) {
   constexpr std::tuple<uint8_t, uint8_t, FEXCore::X86Tables::OpDispatchPtr> TwoByteOpTable[] = {
     {0x05, 1, &OpDispatchBuilder::Bind<&OpDispatchBuilder::SyscallOp, true>},
@@ -191,4 +226,4 @@ inline void SecondaryTables_Install32(auto& FinalTable) {
   InstallToTable(FinalTable, TwoByteOpTable);
 }
 
-}
+} // namespace FEXCore::IR
diff --git a/FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp
index 41e922e34..a5e7c5979 100644
--- a/FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp
+++ b/FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp
@@ -361,6 +361,7 @@ std::array<X86InstInfo, MAX_REP_MOD_TABLE_SIZE> RepModOps = []() consteval {
 
   GenerateTableWithCopy(&Table.at(0), RepModOpTable, std::size(RepModOpTable), &BaseOpsLambda().at(0));
 
+  FEXCore::IR::SecondaryRepModTables_Install(Table);
   return Table;
 }();