diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 55c7aab8a4d6e37f8e1a9bfa3541e6e7fc904921..4770512d0e56c7bc2aa79734040a9bf1a83c5c3c 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -700,7 +700,7 @@ void __ext4_abort(struct super_block *sb, const char *function,
 			jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);
 		save_error_info(sb, function, line);
 	}
-	if (test_opt(sb, ERRORS_PANIC)) {
+	if (test_opt(sb, ERRORS_PANIC) && !system_going_down()) {
 		if (EXT4_SB(sb)->s_journal &&
 		  !(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR))
 			return;