diff --git a/daemon/container_unix.go b/daemon/container_unix.go
index 5c48019ef5..fb6695cc3e 100644
--- a/daemon/container_unix.go
+++ b/daemon/container_unix.go
@@ -714,7 +714,9 @@ func (container *Container) updateJoinInfo(n libnetwork.Network, ep libnetwork.E
 		// It is not an error to get an empty endpoint info
 		return nil
 	}
-	container.NetworkSettings.Networks[n.Name()].Gateway = epInfo.Gateway().String()
+	if epInfo.Gateway() != nil {
+		container.NetworkSettings.Networks[n.Name()].Gateway = epInfo.Gateway().String()
+	}
 	if epInfo.GatewayIPv6().To16() != nil {
 		container.NetworkSettings.Networks[n.Name()].IPv6Gateway = epInfo.GatewayIPv6().String()
 	}