diff --git a/image/daemon/image.go b/image/daemon/image.go
index 86d7f832a..b4ab5841d 100644
--- a/image/daemon/image.go
+++ b/image/daemon/image.go
@@ -172,6 +172,10 @@ func (img *image) diffIDs() ([]v1.Hash, error) {
 }
 
 func (img *image) imageConfig(config *container.Config) v1.Config {
+	if config == nil {
+		return v1.Config{}
+	}
+
 	c := v1.Config{
 		AttachStderr:    config.AttachStderr,
 		AttachStdin:     config.AttachStdin,