diff --git a/daemon/daemon.go b/daemon/daemon.go
index 4507cb452d..671383149f 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -1228,6 +1228,9 @@ func (daemon *Daemon) ImageHistory(name string) ([]*types.ImageHistory, error) {
 func (daemon *Daemon) GetImageID(refOrID string) (image.ID, error) {
 	// Treat as an ID
 	if id, err := digest.ParseDigest(refOrID); err == nil {
+		if _, err := daemon.imageStore.Get(image.ID(id)); err != nil {
+			return "", ErrImageDoesNotExist{refOrID}
+		}
 		return image.ID(id), nil
 	}
 
diff --git a/integration-cli/docker_api_create_test.go b/integration-cli/docker_api_create_test.go
index bfa11ff0ff..d29b35501b 100644
--- a/integration-cli/docker_api_create_test.go
+++ b/integration-cli/docker_api_create_test.go
@@ -32,4 +32,14 @@ func (s *DockerSuite) TestApiCreateWithNotExistImage(c *check.C) {
 	expected = "No such image: test456:latest"
 	c.Assert(strings.TrimSpace(string(resp)), checker.Equals, expected)
 
+	config3 := map[string]interface{}{
+		"Image": "sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efeaaaa",
+	}
+
+	status, resp, err = sockRequest("POST", "/containers/create?name="+name, config3)
+	c.Assert(err, check.IsNil)
+	c.Assert(status, check.Equals, http.StatusNotFound)
+	expected = "No such image: sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efeaaaa"
+	c.Assert(strings.TrimSpace(string(resp)), checker.Equals, expected)
+
 }