diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c
index 8316bd98a9..a5ed9e5465 100644
--- a/xen/arch/x86/xstate.c
+++ b/xen/arch/x86/xstate.c
@@ -292,7 +292,7 @@ void xsave(struct vcpu *v, uint64_t mask)
 
         XSAVE("0x48,");
 
-        if ( !(ptr->xsave_hdr.xstate_bv & XSTATE_FP) ||
+        if ( !(mask & ptr->xsave_hdr.xstate_bv & XSTATE_FP) ||
              /*
               * AMD CPUs don't save/restore FDP/FIP/FOP unless an exception
               * is pending.