diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e534666ad7..3b67f86dba6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ Changes by Version
 
 ##### Breaking Changes
 
+* The default value for the Ingester's flag `ingester.deadlockInterval` has been changed to `0`. With the new default, the ingester won't `panic` if there are no messages for the last minute. To restore the previous behavior, set the flag's value to `1m`.
+
 ##### New Features
 
 ##### Bug fixes, Minor Improvements
diff --git a/cmd/ingester/app/flags.go b/cmd/ingester/app/flags.go
index 3d45337f84f..5aca213bf2a 100644
--- a/cmd/ingester/app/flags.go
+++ b/cmd/ingester/app/flags.go
@@ -64,7 +64,7 @@ const (
 	// DefaultEncoding is the default span encoding
 	DefaultEncoding = kafka.EncodingProto
 	// DefaultDeadlockInterval is the default deadlock interval
-	DefaultDeadlockInterval = 1 * time.Minute
+	DefaultDeadlockInterval = time.Duration(0)
 )
 
 // Options stores the configuration options for the Ingester