diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt
index d2085fe10874..f1a5d5d02c4b 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt
@@ -7,6 +7,7 @@ import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.util.xmlb.annotations.Property
+import org.jetbrains.annotations.ApiStatus
 
 @State(name = "TerminalOptionsProvider", storages = [(Storage("terminal.xml"))])
 class TerminalOptionsProvider : PersistentStateComponent<TerminalOptionsProvider.State> {
@@ -55,6 +56,7 @@ class TerminalOptionsProvider : PersistentStateComponent<TerminalOptionsProvider
   }
 
   class State {
+    var myShellPath: String? = null
     var myTabName: String = "Local"
     var myCloseSessionOnLogout: Boolean = true
     var myReportMouse: Boolean = true
@@ -112,6 +114,13 @@ class TerminalOptionsProvider : PersistentStateComponent<TerminalOptionsProvider
     myState.envDataOptions.set(envData)
   }
 
+  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @Deprecated("To be removed")
+  fun getShellPathAndClear(): String? {
+    val value = myState.myShellPath
+    myState.myShellPath = null
+    return value
+  }
 
   companion object {
     val instance: TerminalOptionsProvider
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
index 7abf639a5b26..873631d14e50 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
@@ -118,6 +118,8 @@ class TerminalProjectOptionsProvider(val project: Project) : PersistentStateComp
         provider.state.shellPath = oldState.myShellPath
         provider.state.envDataOptions.set(oldState.envDataOptions.get())
       }
+      @Suppress("DEPRECATION")
+      provider.state.shellPath = provider.state.shellPath ?: TerminalOptionsProvider.instance.getShellPathAndClear()
       return provider
     }
   }