diff --git a/pkg/commands/docker.go b/pkg/commands/docker.go
index 22ebb58a..6408bb53 100644
--- a/pkg/commands/docker.go
+++ b/pkg/commands/docker.go
@@ -179,12 +179,7 @@ func (c *DockerCommand) createClientStatMonitor(container *Container) {
 		}
 
 		c.ContainerMutex.Lock()
-		toSlice := len(container.StatHistory) - 50
-		if toSlice < 0 {
-			toSlice = 0
-		}
-		container.StatHistory = append(container.StatHistory[toSlice:], recordedStats)
-
+		container.StatHistory = append(container.StatHistory, recordedStats)
 		container.EraseOldHistory()
 		c.ContainerMutex.Unlock()
 	}
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 3976ad98..77007f60 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -289,6 +289,11 @@ type CustomCommand struct {
 // the boolean zero value and this will be ignored when parsing the user's
 // config
 func GetDefaultConfig() UserConfig {
+	duration, err := time.ParseDuration("3m")
+	if err != nil {
+		panic(err)
+	}
+
 	return UserConfig{
 		Gui: GuiConfig{
 			ScrollHeight:      2,
@@ -336,6 +341,7 @@ func GetDefaultConfig() UserConfig {
 			Method: "never",
 		},
 		Stats: StatsConfig{
+			MaxDuration: duration,
 			Graphs: []GraphConfig{
 				{
 					Caption:  "CPU (%)",