diff --git a/api/handler/event.go b/api/handler/event.go
index 44fbf24c9..342d285d3 100644
--- a/api/handler/event.go
+++ b/api/handler/event.go
@@ -19,11 +19,8 @@
 package handler
 
 import (
-	"time"
-
 	"github.com/goodrain/rainbond/db"
 	dbmodel "github.com/goodrain/rainbond/db/model"
-	"github.com/sirupsen/logrus"
 )
 
 // ServiceEventHandler -
@@ -37,47 +34,5 @@ func NewServiceEventHandler() *ServiceEventHandler {
 
 // ListByEventIDs -
 func (s *ServiceEventHandler) ListByEventIDs(eventIDs []string) ([]*dbmodel.ServiceEvent, error) {
-	events, err := db.GetManager().ServiceEventDao().GetEventByEventIDs(eventIDs)
-	if err != nil {
-		return nil, err
-	}
-
-	// timeout events
-	var timeoutEvents []*dbmodel.ServiceEvent
-	for _, event := range events {
-		if !s.isTimeout(event) {
-			continue
-		}
-		event.Status = "timeout"
-		event.FinalStatus = "complete"
-		timeoutEvents = append(timeoutEvents, event)
-	}
-
-	return events, db.GetManager().ServiceEventDao().UpdateInBatch(timeoutEvents)
-}
-
-func (s *ServiceEventHandler) isTimeout(event *dbmodel.ServiceEvent) bool {
-	if event.FinalStatus != "" {
-		return false
-	}
-
-	startTime, err := time.ParseInLocation(time.RFC3339, event.StartTime, time.Local)
-	if err != nil {
-		logrus.Errorf("[ServiceEventHandler] [isTimeout] parse start time(%s): %v", event.StartTime, err)
-		return false
-	}
-
-	if event.OptType == "deploy" || event.OptType == "create" || event.OptType == "build" || event.OptType == "upgrade" {
-		end := startTime.Add(3 * time.Minute)
-		if time.Now().After(end) {
-			return true
-		}
-	} else {
-		end := startTime.Add(30 * time.Second)
-		if time.Now().After(end) {
-			return true
-		}
-	}
-
-	return false
+	return db.GetManager().ServiceEventDao().GetEventByEventIDs(eventIDs)
 }