diff --git a/python/pluginResources/messages/PyBundle.properties b/python/pluginResources/messages/PyBundle.properties
index a1bbf6fdeb11..b997cf1334be 100644
--- a/python/pluginResources/messages/PyBundle.properties
+++ b/python/pluginResources/messages/PyBundle.properties
@@ -289,7 +289,6 @@ python.console=Python Console
 python.console.history.root=Python Consoles
 python.console.run.anything.provider=Runs Python Console
 python.console.not.supported=Python console for {0} interpreter is not supported
-python.console.toolbar.action.available.non.interactive=The action is not available for non-interactive shell
 
 runcfg.unittest.dlg.test_function_title=Function
 run.configuration.remote.debug.name=Python Remote Debug
diff --git a/python/src/com/jetbrains/python/actions/PyExecuteInConsole.kt b/python/src/com/jetbrains/python/actions/PyExecuteInConsole.kt
index 6c3edefcd6bf..c3176dbcede0 100644
--- a/python/src/com/jetbrains/python/actions/PyExecuteInConsole.kt
+++ b/python/src/com/jetbrains/python/actions/PyExecuteInConsole.kt
@@ -3,7 +3,6 @@
 
 package com.jetbrains.python.actions
 
-import com.intellij.codeInsight.hint.HintManager
 import com.intellij.execution.target.value.TargetEnvironmentFunction
 import com.intellij.execution.ui.ExecutionConsole
 import com.intellij.execution.ui.RunContentDescriptor
@@ -17,7 +16,6 @@ import com.intellij.openapi.wm.ToolWindowId
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.ui.content.ContentManager
 import com.intellij.xdebugger.XDebuggerManager
-import com.jetbrains.python.PyBundle
 import com.jetbrains.python.console.*
 import com.jetbrains.python.run.PythonRunConfiguration
 import java.util.function.Consumer
@@ -80,7 +78,6 @@ private fun executeCodeInConsole(project: Project,
   var isDebug = false
   var newConsoleListener: PydevConsoleRunner.ConsoleListener? = null
   val virtualFile = (editor as? EditorImpl)?.virtualFile
-  if (!checkIfAvailableAndShowHint(editor)) return
   if (canUseExistingConsole) {
     if (virtualFile != null && PyExecuteConsoleCustomizer.instance.isCustomDescriptorSupported(virtualFile)) {
       val (descriptor, listener) = getCustomDescriptor(project, virtualFile)
@@ -114,16 +111,6 @@ private fun executeCodeInConsole(project: Project,
   }
 }
 
-fun checkIfAvailableAndShowHint(editor: Editor?): Boolean {
-  val virtualFile = (editor as? EditorImpl)?.virtualFile
-  if (editor != null && virtualFile != null && PyExecuteConsoleCustomizer.instance.getCustomDescriptorType(virtualFile) ==
-      DescriptorType.NON_INTERACTIVE) {
-    HintManager.getInstance().showErrorHint(editor, PyBundle.message("python.console.toolbar.action.available.non.interactive"))
-    return false
-  }
-  return true
-}
-
 fun getCustomDescriptor(project: Project, virtualFile: VirtualFile): Pair<RunContentDescriptor?, PydevConsoleRunner.ConsoleListener?> {
   val executeCustomizer = PyExecuteConsoleCustomizer.instance
   when (executeCustomizer.getCustomDescriptorType(virtualFile)) {
@@ -142,9 +129,6 @@ fun getCustomDescriptor(project: Project, virtualFile: VirtualFile): Pair<RunCon
     DescriptorType.STARTING -> {
       return Pair(null, null)
     }
-    DescriptorType.NON_INTERACTIVE -> {
-      throw IllegalStateException("This code shouldn't be called for a non-interactive descriptor")
-    }
     else -> {
       throw IllegalStateException("Custom descriptor for ${virtualFile} is null")
     }
diff --git a/python/src/com/jetbrains/python/actions/PyExecuteSelectionAction.java b/python/src/com/jetbrains/python/actions/PyExecuteSelectionAction.java
index d02ea91438ab..4b980d0f070d 100644
--- a/python/src/com/jetbrains/python/actions/PyExecuteSelectionAction.java
+++ b/python/src/com/jetbrains/python/actions/PyExecuteSelectionAction.java
@@ -38,7 +38,6 @@ public class PyExecuteSelectionAction extends DumbAwareAction {
     if (editor != null && project != null) {
       PythonRunConfiguration config = PyExecuteConsoleCustomizer.Companion.getInstance().getContextConfig(e.getDataContext());
       final String selectionText = getSelectionText(editor);
-      if (!PyExecuteInConsole.checkIfAvailableAndShowHint(editor)) return;
       if (selectionText != null) {
         PyExecuteInConsole.executeCodeInConsole(project, selectionText, editor, true, true, false, config);
       }
diff --git a/python/src/com/jetbrains/python/console/PyExecuteConsoleCustomizer.kt b/python/src/com/jetbrains/python/console/PyExecuteConsoleCustomizer.kt
index befddbfd5c9b..9a1132473b50 100644
--- a/python/src/com/jetbrains/python/console/PyExecuteConsoleCustomizer.kt
+++ b/python/src/com/jetbrains/python/console/PyExecuteConsoleCustomizer.kt
@@ -77,5 +77,5 @@ interface PyExecuteConsoleCustomizer {
 }
 
 enum class DescriptorType {
-  NEW, EXISTING, STARTING, NON_INTERACTIVE
+  NEW, EXISTING, STARTING
 }
\ No newline at end of file