diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
index 10d558cf9b3d..dcfedbde5eeb 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 /*
  * Class BreakpointManager
@@ -308,7 +294,9 @@ public class BreakpointManager {
     for (Element element : parentNode.getChildren()) {
       myOriginalBreakpointsNodes.put(element.getName(), element.clone());
     }
-    myStartupManager.runWhenProjectIsInitialized(() -> doRead(parentNode));
+    if (!myProject.isDefault()) {
+      myStartupManager.runWhenProjectIsInitialized(() -> doRead(parentNode));
+    }
   }
 
   private void doRead(@NotNull final Element parentNode) {
@@ -398,9 +386,7 @@ public class BreakpointManager {
         }
       }
 
-      if (!myProject.isDefault()) {
-        DebuggerInvocationUtil.invokeLater(myProject, this::updateBreakpointsUI);
-      }
+      DebuggerInvocationUtil.invokeLater(myProject, this::updateBreakpointsUI);
     });
 
     myUIProperties.clear();