diff --git a/gns3server/config_samples/gns3_server.conf b/gns3server/config_samples/gns3_server.conf
index 275f26358..b200029dd 100644
--- a/gns3server/config_samples/gns3_server.conf
+++ b/gns3server/config_samples/gns3_server.conf
@@ -187,6 +187,9 @@ monitor_host = 127.0.0.1
 enable_hardware_acceleration = True
 ; Require hardware acceleration in order to start VMs
 require_hardware_acceleration = False
+; kvmclock and TSC deadline timer of KVM guests: "auto" turns them off only when this server runs on
+; Hyper-V without a usable TSC (guests panic with soft lockups or hang), "enabled" or "disabled" forces them
+kvmclock = auto
 ; Allow unsafe additional command line options
 allow_unsafe_options = False
 ; Path to the OVMF firmware directory