diff --git a/kestrel/src/shell.c b/kestrel/src/shell.c
index d77388bb2a6ffd332f1d4a06a10e1bc8bfba0419..3c76dc0aea97e28928be2d4e237398388ed35d2e 100644
--- a/kestrel/src/shell.c
+++ b/kestrel/src/shell.c
@@ -55,19 +55,6 @@ static void kestrel_console_thread(const void *p1, const void *p2)
 
 	k_mutex_unlock(&shell->ctx->wr_mtx);
 
-	// FIXME
-	// HACK
-	// Work around crash when attempting to select history (up arrow) after re-enabling the shell
-	// The root cause of Zephyr crashing under the following conditions needs to be investigated
-	// and fixed:
-	// 1.) shell_stop()
-	// 2.) Arbitrary data input to device driver underneath stopped shell
-	// 3.) shell_start()
-	// 4.) Up arrow input to scroll through history buffer
-	if (IS_ENABLED(CONFIG_SHELL_HISTORY)) {
-		z_shell_history_init(shell->history);
-	}
-
 	// Enable shell and logging
 	if (IS_ENABLED(CONFIG_SHELL_LOG_BACKEND) && active_log_backend) {
 		z_shell_log_backend_enable(shell->log_backend, (void *)shell, active_log_level);