diff --git a/External/xbyak b/External/xbyak
index f17cb9d6b9..c68cc53d18 160000
--- a/External/xbyak
+++ b/External/xbyak
@@ -1 +1 @@
-Subproject commit f17cb9d6b94c44e0c7f2b569b0e360c416e628d5
+Subproject commit c68cc53d18bd7c242194d56ad276d50ff3c1ae3d
diff --git a/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp b/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp
index 0e9b88cca7..9a73b461a7 100644
--- a/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp
+++ b/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp
@@ -51,6 +51,10 @@ class x86HostRunner final : public Xbyak::CodeGenerator {
     push(r13);
     push(r14);
     push(r15);
+    rdfsbase(rbx);
+    push(rbx);
+    rdgsbase(rbx);
+    push(rbx);
     sub(rsp, 8);
 
     // Save this stack pointer so we can cleanly shutdown the emulation with a long jump
@@ -105,6 +109,10 @@ class x86HostRunner final : public Xbyak::CodeGenerator {
 
     add(rsp, 8);
 
+    pop(rbx);
+    wrgsbase(rbx);
+    pop(rbx);
+    wrfsbase(rbx);
     pop(r15);
     pop(r14);
     pop(r13);