diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09b19f7a9a2..b10dce87d20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * [CHANGE] From path.Join to filepath.Join [#338](https://github.com/grafana/tempo/pull/338)
 * [BUGFIX] Frequent errors logged by compactor regarding meta not found [#327](https://github.com/grafana/tempo/pull/327)
+* [BUGFIX] Fix distributors panicking on rollout [#343](https://github.com/grafana/tempo/pull/343)
 
 ## v0.3.0
 
diff --git a/modules/distributor/receiver/shim.go b/modules/distributor/receiver/shim.go
index 8f6556b9dab..09e669dd4cb 100644
--- a/modules/distributor/receiver/shim.go
+++ b/modules/distributor/receiver/shim.go
@@ -184,7 +184,6 @@ func (r *receiversShim) ConsumeTraces(ctx context.Context, td pdata.Traces) erro
 // implements component.Host
 func (r *receiversShim) ReportFatalError(err error) {
 	level.Error(util.Logger).Log("msg", "fatal error reported", "err", err)
-	panic(fmt.Sprintf("Fatal error %v", err))
 }
 
 // implements component.Host