diff --git a/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp
index 6d8eb1fc86..54cbf02d09 100644
--- a/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp
+++ b/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp
@@ -93,11 +93,10 @@ ALWAYS_INLINE MMX SoftFPU::mmx_get(u8 index) const
 ALWAYS_INLINE void SoftFPU::mmx_set(u8 index, MMX value)
 {
     m_storage[index].mmx = value;
-    // The high bytes are set to 0b11... to make the floatingpoint value NaN.
+    // The high bytes are set to 0b11... to make the floating-point value NaN.
     // This way we are technically able to find out if we are reading the wrong
     // type, but this is still difficult, so we use our own lookup for that
-    // We set the alignment bytes to all 1's, too, just in case
-    m_storage[index].__high = ~(decltype(m_storage[index].__high))0u;
+    m_storage[index].__high = 0xFFFFU;
     m_reg_is_mmx[index] = true;
 }
 
diff --git a/Userland/DevTools/UserspaceEmulator/SoftFPU.h b/Userland/DevTools/UserspaceEmulator/SoftFPU.h
index c9376b9849..f02f83f5e7 100644
--- a/Userland/DevTools/UserspaceEmulator/SoftFPU.h
+++ b/Userland/DevTools/UserspaceEmulator/SoftFPU.h
@@ -289,12 +289,7 @@ private:
         long double fp;
         struct {
             MMX mmx;
-            Conditional<sizeof(long double) == 16,
-                u64,
-                Conditional<sizeof(long double) == 12,
-                    u32,
-                    u16>>
-                __high;
+            u16 __high;
         };
     } m_storage[8];