diff --git a/files/image_config/ntp/ntp.conf.j2 b/files/image_config/ntp/ntp.conf.j2
index cef6527fc2..dbde694432 100644
--- a/files/image_config/ntp/ntp.conf.j2
+++ b/files/image_config/ntp/ntp.conf.j2
@@ -5,6 +5,10 @@
 
 # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
 
+# To avoid ntpd from panic and exit if the drift between new time and
+# current system time is large.
+tinker panic 0
+
 driftfile /var/lib/ntp/ntp.drift