diff --git a/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarksStartupActivity.kt b/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarksStartupActivity.kt
index 5b6a3b29aa4f..2c7252de45d2 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarksStartupActivity.kt
+++ b/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarksStartupActivity.kt
@@ -1,15 +1,20 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.bookmark
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.components.serviceAsync
+import com.intellij.openapi.extensions.ExtensionNotApplicableException
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
 
-internal class BookmarksStartupActivity : ProjectActivity {
-  override suspend fun execute(project: Project) {
+private class BookmarksStartupActivity : ProjectActivity {
+  init {
     if (ApplicationManager.getApplication().isHeadlessEnvironment) {
-      return
+      throw ExtensionNotApplicableException.create()
     }
-    BookmarksManager.getInstance(project)
+  }
+
+  override suspend fun execute(project: Project) {
+    project.serviceAsync<BookmarksManager>()
   }
 }