Index: /trunk/src/VBox/VMM/VMMR0/HMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMR0.cpp	(revision 50739)
+++ /trunk/src/VBox/VMM/VMMR0/HMR0.cpp	(revision 50740)
@@ -1471,10 +1471,11 @@
         AssertRCReturn(rc, rc);
         Assert(!pCpu->fConfigured);
-    }
-
-    /* Reset these to force a TLB flush for the next entry. */
-    pVCpu->hm.s.idLastCpu    = NIL_RTCPUID;
+
+        /* For obtaining a non-zero ASID/VPID on next re-entry. */
+        pVCpu->hm.s.idLastCpu = NIL_RTCPUID;
+    }
+
+    /* Clear it while leaving HM context, hmPokeCpuForTlbFlush() relies on this. */
     pVCpu->hm.s.idEnteredCpu = NIL_RTCPUID;
-    VMCPU_FF_SET(pVCpu, VMCPU_FF_TLB_FLUSH);
 
     /* Clear the VCPU <-> host CPU mapping as we've left HM context. */