diff --git a/api/cli/cli.go b/api/cli/cli.go
index d1bace6a3..5df0ce974 100644
--- a/api/cli/cli.go
+++ b/api/cli/cli.go
@@ -33,7 +33,6 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) {
 	flags := &portainer.CLIFlags{
 		Addr:              kingpin.Flag("bind", "Address and port to serve Portainer").Default(defaultBindAddress).Short('p').String(),
 		Assets:            kingpin.Flag("assets", "Path to the assets").Default(defaultAssetsDirectory).Short('a').String(),
-		CheckHealth:       kingpin.Flag("check-health", "GET http://localhost:<port>/api/health endpoint").Default(defaultCheckHealth).Short('c').Bool(),
 		Data:              kingpin.Flag("data", "Path to the folder where the data is stored").Default(defaultDataDirectory).Short('d').String(),
 		Endpoint:          kingpin.Flag("host", "Dockerd endpoint").Short('H').String(),
 		ExternalEndpoints: kingpin.Flag("external-endpoints", "Path to a file defining available endpoints").String(),
diff --git a/api/cli/defaults.go b/api/cli/defaults.go
index 2c913ad84..2d350c1c7 100644
--- a/api/cli/defaults.go
+++ b/api/cli/defaults.go
@@ -6,7 +6,6 @@ const (
 	defaultBindAddress     = ":9000"
 	defaultDataDirectory   = "/data"
 	defaultAssetsDirectory = "./"
-	defaultCheckHealth     = "false"
 	defaultNoAuth          = "false"
 	defaultNoAnalytics     = "false"
 	defaultTLSVerify       = "false"
diff --git a/api/cli/defaults_windows.go b/api/cli/defaults_windows.go
index 9971063b6..a94657258 100644
--- a/api/cli/defaults_windows.go
+++ b/api/cli/defaults_windows.go
@@ -4,7 +4,6 @@ const (
 	defaultBindAddress     = ":9000"
 	defaultDataDirectory   = "C:\\data"
 	defaultAssetsDirectory = "./"
-	defaultCheckHealth     = "false"
 	defaultNoAuth          = "false"
 	defaultNoAnalytics     = "false"
 	defaultTLSVerify       = "false"
diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go
index efa51c1f3..3c8c9f2aa 100644
--- a/api/cmd/portainer/main.go
+++ b/api/cmd/portainer/main.go
@@ -14,7 +14,6 @@ import (
 	"github.com/portainer/portainer/ldap"
 
 	"log"
-	"os"
 )
 
 func initCLI() *portainer.CLIFlags {
@@ -172,19 +171,6 @@ func retrieveFirstEndpointFromDatabase(endpointService portainer.EndpointService
 func main() {
 	flags := initCLI()
 
-	if *flags.CheckHealth {
-		statuscode, err := http.HealthCheck(*flags.Addr)
-		if err == nil {
-			if statuscode == 200 {
-				log.Println(*flags.Addr, ": Online - response:", statuscode)
-				os.Exit(0)
-			} else {
-				log.Fatal(*flags.Addr, ": Error - response:", statuscode)
-			}
-		}
-		log.Fatal("Connection error:", err.Error())
-	}
-
 	fileService := initFileService(*flags.Data)
 
 	store := initStore(*flags.Data)
diff --git a/api/http/health_check.go b/api/http/health_check.go
deleted file mode 100644
index 08f4623f0..000000000
--- a/api/http/health_check.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package http
-
-import (
-	"net/http"
-)
-
-// HealthCheck GETs /api/status
-func HealthCheck(addr string) (int, error) {
-	resp, err := http.Get("http://" + addr + "/api/status")
-	return resp.StatusCode, err
-}
diff --git a/api/portainer.go b/api/portainer.go
index 9aac8cfb2..86f520997 100644
--- a/api/portainer.go
+++ b/api/portainer.go
@@ -13,7 +13,6 @@ type (
 	CLIFlags struct {
 		Addr              *string
 		Assets            *string
-		CheckHealth       *bool
 		Data              *string
 		Endpoint          *string
 		ExternalEndpoints *string
diff --git a/build/linux/Dockerfile b/build/linux/Dockerfile
index 3bbc694f9..e16144acc 100644
--- a/build/linux/Dockerfile
+++ b/build/linux/Dockerfile
@@ -9,5 +9,3 @@ WORKDIR /
 EXPOSE 9000
 
 ENTRYPOINT ["/portainer"]
-
-HEALTHCHECK --start-period=10ms --interval=30s --timeout=5s --retries=3 CMD ["/portainer", "-c"]