diff --git a/cvat-ui/src/components/projects-page/project-list.tsx b/cvat-ui/src/components/projects-page/project-list.tsx
index 134286be..431f5da7 100644
--- a/cvat-ui/src/components/projects-page/project-list.tsx
+++ b/cvat-ui/src/components/projects-page/project-list.tsx
@@ -42,7 +42,7 @@ export default function ProjectListComponent(): JSX.Element {
{projectInstances.map(
(row: any[]): JSX.Element => (
-
+
{row.map((instance: any) => (
diff --git a/cvat-ui/src/components/task-page/task-page.tsx b/cvat-ui/src/components/task-page/task-page.tsx
index ac440600..7537ce5a 100644
--- a/cvat-ui/src/components/task-page/task-page.tsx
+++ b/cvat-ui/src/components/task-page/task-page.tsx
@@ -28,14 +28,16 @@ interface TaskPageComponentProps {
type Props = TaskPageComponentProps & RouteComponentProps<{ id: string }>;
class TaskPageComponent extends React.PureComponent {
- public componentDidUpdate(): void {
- const {
- deleteActivity, history, task, fetching, getTask,
- } = this.props;
+ public componentDidMount(): void {
+ const { task, fetching, getTask } = this.props;
if (task === null && !fetching) {
getTask();
}
+ }
+
+ public componentDidUpdate(): void {
+ const { deleteActivity, history } = this.props;
if (deleteActivity) {
history.replace('/tasks');