diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 4d05e14ea60c8dfe95aa8ae63c55781c9f5a2279..c2164fad0083b116c5773880b67adfed2d23e5f8 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -137,7 +137,7 @@ int vty_init(const struct file_operations *console_fops);
 
 static inline bool vt_force_oops_output(struct vc_data *vc)
 {
-	if (oops_in_progress && vc->vc_panic_force_write)
+	if (oops_in_progress && vc->vc_panic_force_write  && panic_timeout >= 0)
 		return true;
 	return false;
 }