diff --git a/api/server/server.go b/api/server/server.go
index 18c9a93d97..ab0f98fa47 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -978,8 +978,8 @@ func writeCorsHeaders(w http.ResponseWriter, r *http.Request) {
 }
 
 func ping(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	w.Write([]byte{'O', 'K'})
-	return nil
+	_, err := w.Write([]byte{'O', 'K'})
+	return err
 }
 
 func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, localRoute string, handlerFunc HttpApiFunc, enableCors bool, dockerVersion version.Version) http.HandlerFunc {
diff --git a/docs/sources/reference/api/docker_remote_api_v1.11.md b/docs/sources/reference/api/docker_remote_api_v1.11.md
index 5ad174565d..53e07b380c 100644
--- a/docs/sources/reference/api/docker_remote_api_v1.11.md
+++ b/docs/sources/reference/api/docker_remote_api_v1.11.md
@@ -1181,6 +1181,7 @@ Ping the docker server
     Status Codes:
 
     -   **200** - no error
+    -   **500** - server error
 
 ### Create a new image from a container's changes