diff --git a/cmd/explorer/main.go b/cmd/explorer/main.go
index afe23b3e4b..c3853ff089 100644
--- a/cmd/explorer/main.go
+++ b/cmd/explorer/main.go
@@ -58,6 +58,8 @@ func init() {
 	gob.Register(types.DataTableSaveState{})
 }
 
+var frontendHttpServer *http.Server
+
 func main() {
 	configPath := flag.String("config", "", "Path to the config file, if empty string defaults will be used")
 	versionFlag := flag.Bool("version", false, "Show version and exit")
@@ -639,7 +641,7 @@ func main() {
 		if utils.Config.Frontend.HttpIdleTimeout == 0 {
 			utils.Config.Frontend.HttpIdleTimeout = time.Minute
 		}
-		srv := &http.Server{
+		frontendHttpServer = &http.Server{
 			Addr:         cfg.Frontend.Server.Host + ":" + cfg.Frontend.Server.Port,
 			WriteTimeout: utils.Config.Frontend.HttpWriteTimeout,
 			ReadTimeout:  utils.Config.Frontend.HttpReadTimeout,
@@ -647,9 +649,9 @@ func main() {
 			Handler:      n,
 		}
 
-		logrus.Printf("http server listening on %v", srv.Addr)
+		logrus.Printf("http server listening on %v", frontendHttpServer.Addr)
 		go func() {
-			if err := srv.ListenAndServe(); err != nil {
+			if err := frontendHttpServer.ListenAndServe(); err != nil {
 				logrus.WithError(err).Fatal("Error serving frontend")
 			}
 		}()
@@ -670,5 +672,14 @@ func main() {
 
 	utils.WaitForCtrlC()
 
+	if frontendHttpServer != nil {
+		logrus.Infof("shutting down frontendHttpServer")
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+		defer cancel()
+		if err := frontendHttpServer.Shutdown(ctx); err != nil {
+			logrus.WithError(err).Fatal("error shutting down frontend server")
+		}
+	}
+
 	logrus.Println("exiting...")
 }
diff --git a/utils/utils.go b/utils/utils.go
index fa3e9310c4..35313ff243 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -28,6 +28,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"syscall"
 	"time"
 	"unicode/utf8"
 
@@ -395,7 +396,7 @@ func GWeiBytesToEther(gwei []byte) decimal.Decimal {
 // WaitForCtrlC will block/wait until a control-c is pressed
 func WaitForCtrlC() {
 	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
+	signal.Notify(c, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 	<-c
 }