@@ -208,10 +208,12 @@ func (daemon *Daemon) populateCommand(c *container.Container, env []string) erro

 		BlkioThrottleWriteBpsDevice:  writeBpsDevice,

 		BlkioThrottleReadIOpsDevice:  readIOpsDevice,

 		BlkioThrottleWriteIOpsDevice: writeIOpsDevice,

-		OomKillDisable:               *c.HostConfig.OomKillDisable,

 		MemorySwappiness:             -1,

 	}

+	if c.HostConfig.OomKillDisable != nil {

+		resources.OomKillDisable = *c.HostConfig.OomKillDisable

+	}

 	if c.HostConfig.MemorySwappiness != nil {

 		resources.MemorySwappiness = *c.HostConfig.MemorySwappiness

 	}