diff --git a/agent/stats/engine.go b/agent/stats/engine.go
index d04feb7526c..d81977e6658 100644
--- a/agent/stats/engine.go
+++ b/agent/stats/engine.go
@@ -402,8 +402,8 @@ func (engine *DockerStatsEngine) getContainerMetricsForTask(taskArn string) ([]*
 			continue
 		}
 
-		if !container.statsQueue.resetThresholdElapsed(queueResetThreshold) &&
-			!container.statsQueue.enoughDatapointsInBuffer() {
+		if !container.statsQueue.enoughDatapointsInBuffer() &&
+			!container.statsQueue.resetThresholdElapsed(queueResetThreshold) {
 			seelog.Debug("Stats not ready for container %s", dockerID)
 			continue
 		}
diff --git a/agent/tcs/client/client_test.go b/agent/tcs/client/client_test.go
index f825b700298..b15d8f1619e 100644
--- a/agent/tcs/client/client_test.go
+++ b/agent/tcs/client/client_test.go
@@ -157,7 +157,6 @@ func TestPublishMetricsRequest(t *testing.T) {
 	cs.Close()
 }
 func TestPublishMetricsOnceEmptyStatsError(t *testing.T) {
-
 	cs := clientServer{
 		statsEngine: &emptyStatsEngine{},
 	}