diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
index 2c2a7303a953..43f39b09af1b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -523,12 +523,12 @@ public class CodeCompletionHandlerBase {
     final Project project = hostFile.getProject();
 
     if (!synchronous) {
-      if (!CompletionServiceImpl.assertPhase(CompletionPhase.CommittingDocuments.class, CompletionPhase.NoCompletion.getClass())) {
-        CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion);
+      if (CompletionServiceImpl.isPhase(CompletionPhase.NoCompletion.getClass()) ||
+          !CompletionServiceImpl.assertPhase(CompletionPhase.CommittingDocuments.class)) {
         Disposer.dispose(translator);
         return;
       }
-      
+
       final CompletionPhase.CommittingDocuments phase = (CompletionPhase.CommittingDocuments)CompletionServiceImpl.getCompletionPhase();
 
       CompletionAutoPopupHandler.runLaterWithCommitted(project, hostDocument, new Runnable() {