diff --git a/kernel/server/port.go b/kernel/server/port.go
index 98cfbedb1..0ae6080ff 100644
--- a/kernel/server/port.go
+++ b/kernel/server/port.go
@@ -35,14 +35,6 @@ import (
 func killRunningKernel() {
 	defer logging.Recover()
 
-	if "dev" == util.Mode {
-		return
-	}
-
-	if util.ContainerStd != util.Container {
-		return
-	}
-
 	processes, err := goPS.Processes()
 	if nil != err {
 		logging.LogErrorf("get processes failed: %s", err)
diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index 941517f9f..0ac7ab2f6 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -74,7 +74,7 @@ func Serve(fastMode bool) {
 	serveTemplates(ginServer)
 	api.ServeAPI(ginServer)
 
-	if !fastMode {
+	if !fastMode && "prod" == util.Mode && util.ContainerStd == util.Container {
 		killRunningKernel()
 	}