diff --git a/src/share/vm/runtime/vm_operations.cpp b/src/share/vm/runtime/vm_operations.cpp
index 3e1fc743fe..01bb7e2560 100644
--- a/src/share/vm/runtime/vm_operations.cpp
+++ b/src/share/vm/runtime/vm_operations.cpp
@@ -129,6 +129,7 @@ void VM_DeoptimizeNMethod::invalidate(nmethod* nm) {
     // Invalidating the HotSpotNmethod means we want the nmethod
     // to be deoptimized.
     nm->mark_for_deoptimization();
+    nm->make_not_entrant();
     VM_DeoptimizeNMethod op(nm);
     VMThread::execute(&op);
   }
@@ -146,8 +147,6 @@ void VM_DeoptimizeNMethod::doit() {
 
   // Deoptimize all activations depending on marked nmethods
   Deoptimization::deoptimize_dependents();
-
-  _nm->make_not_entrant();
 }
 
 #ifndef PRODUCT