diff --git a/core/src/main/scala/kafka/log/Log.scala b/core/src/main/scala/kafka/log/Log.scala
index f634896..bf357ed 100644
--- a/core/src/main/scala/kafka/log/Log.scala
+++ b/core/src/main/scala/kafka/log/Log.scala
@@ -563,8 +563,12 @@ private[kafka] class Log(val dir: File,
     else
       offsetTimeArray = new Array[(Long, Long)](segsArray.length)
 
-    for(i <- 0 until segsArray.length)
-      offsetTimeArray(i) = (segsArray(i).start, segsArray(i).messageSet.file.lastModified)
+    for(i <- 0 until segsArray.length) {
+      if (segsArray(i).size > 0)
+        offsetTimeArray(i) = (segsArray(i).start, segsArray(i).firstAppendTime.get)
+      else
+        offsetTimeArray(i) = (segsArray(i).start, segsArray(i).messageSet.file.lastModified)
+    }
     if(segsArray.last.size > 0)
       offsetTimeArray(segsArray.length) = (logEndOffset, time.milliseconds)