diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalUsageLocalStorage.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalUsageLocalStorage.kt
index 286ef6aac5b5..6830728f08f4 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalUsageLocalStorage.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalUsageLocalStorage.kt
@@ -15,8 +15,9 @@ internal class TerminalUsageLocalStorage : PersistentStateComponent<TerminalUsag
   val executedCommandsNumber: Int
     get() = state.shellToExecutedCommandsNumber.values.sum()
 
-  val mostUsedShell: String
-    get() = state.shellToExecutedCommandsNumber.keys.maxBy { state.shellToExecutedCommandsNumber[it]!! }
+  /** Can be null only if [executedCommandsNumber] is zero */
+  val mostUsedShell: String?
+    get() = state.shellToExecutedCommandsNumber.keys.maxByOrNull { state.shellToExecutedCommandsNumber[it]!! }
 
   fun recordCommandExecuted(shellName: String) {
     state.shellToExecutedCommandsNumber.merge(shellName.lowercase(), 1, Int::plus)
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/feedback/BlockTerminalFeedbackDialog.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/feedback/BlockTerminalFeedbackDialog.kt
index 1e55d675f9df..8d4a7f55cd50 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/feedback/BlockTerminalFeedbackDialog.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/feedback/BlockTerminalFeedbackDialog.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.terminal.exp.feedback
 
+import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.NlsSafe
 import com.intellij.platform.feedback.dialog.BlockBasedFeedbackDialog
@@ -23,9 +24,18 @@ internal class BlockTerminalFeedbackDialog(project: Project, forTest: Boolean) :
 
   override val mySystemInfoData: BlockTerminalUsageData by lazy {
     val usageStorage = TerminalUsageLocalStorage.getInstance()
+    val rawMostUsedShell = usageStorage.mostUsedShell
+    val mostUsedShell = if (rawMostUsedShell == null && forTest) {
+      thisLogger().warn("No information about most used shell, because no commands were executed in the terminal")
+      "none"
+    }
+    else {
+      // It is guaranteed to be not null if it is not a test because of the check in BlockTerminalSurveyConfig.checkExtraConditionSatisfied
+      rawMostUsedShell!!
+    }
 
     BlockTerminalUsageData(
-      mostUsedShell = usageStorage.mostUsedShell,
+      mostUsedShell = mostUsedShell,
       executedCommandsNumber = usageStorage.executedCommandsNumber,
       feedbackMoment = getFeedbackMoment(project),
       systemInfo = CommonFeedbackSystemData.getCurrentData()