diff --git a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/remoting/ActionRemoteBehavior.kt b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/remoting/ActionRemoteBehavior.kt
index f183e06dac49..0e9eeed5f3e9 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/remoting/ActionRemoteBehavior.kt
+++ b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/remoting/ActionRemoteBehavior.kt
@@ -69,7 +69,7 @@ enum class ActionRemoteBehavior {
 @ApiStatus.Internal
 @ApiStatus.Experimental
 interface ActionRemoteBehaviorSpecification {
-  fun getBehavior(): ActionRemoteBehavior
+  fun getBehavior(): ActionRemoteBehavior?
 
   interface Frontend : ActionRemoteBehaviorSpecification {
     override fun getBehavior(): ActionRemoteBehavior = ActionRemoteBehavior.FrontendOnly
diff --git a/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/actions/WelcomeScreenAwareActionsCustomizer.kt b/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/actions/WelcomeScreenAwareActionsCustomizer.kt
index b1883f6d2a5f..19fd32d0c9e9 100644
--- a/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/actions/WelcomeScreenAwareActionsCustomizer.kt
+++ b/platform/non-modal-welcome-screen/src/com/intellij/platform/ide/nonModalWelcomeScreen/actions/WelcomeScreenAwareActionsCustomizer.kt
@@ -40,7 +40,7 @@ private fun ActionRuntimeRegistrar.replaceExistingAction(
 }
 
 private fun hideActionOnWelcomeScreen(action: AnAction): AnAction {
-  return if (action is ActionRemoteBehaviorSpecification) {
+  return if (action is ActionRemoteBehaviorSpecification && action.getBehavior() != null) {
     WelcomeScreenHiddenActionWithRemoteSpec(action)
   }
   else {
@@ -51,7 +51,7 @@ private fun hideActionOnWelcomeScreen(action: AnAction): AnAction {
 private class WelcomeScreenHiddenActionWithRemoteSpec<T>(val actionWithSpec: T) : WelcomeScreenHiddenAction(actionWithSpec),
                                                                                   ActionRemoteBehaviorSpecification
   where T : AnAction, T : ActionRemoteBehaviorSpecification {
-  override fun getBehavior(): ActionRemoteBehavior = actionWithSpec.getBehavior()
+  override fun getBehavior(): ActionRemoteBehavior? = actionWithSpec.getBehavior()
 }
 
 private open class WelcomeScreenHiddenAction(action: AnAction) : AnActionWrapper(action) {