diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5d159214d2..58ffa2d3e85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed CVAT format import for frame stepped tasks (<https://github.com/openvinotoolkit/cvat/pull/2151>)
 - Fixed unnecessary pyhash dependency (<https://github.com/openvinotoolkit/cvat/pull/2170>)
 - Fixed Data is not getting cleared, even after deleting the Task from Django Admin App(<https://github.com/openvinotoolkit/cvat/issues/1925>)
+- Fixed blinking message: "Some tasks have not been showed because they do not have any data" (<https://github.com/openvinotoolkit/cvat/pull/2200>)
+- Fixed case when a task with 0 jobs is shown as "Completed" in UI (<https://github.com/openvinotoolkit/cvat/pull/2200>)
+
 ### Security
 -
 
diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json
index 3d8430f9ea7..c04acc93747 100644
--- a/cvat-ui/package-lock.json
+++ b/cvat-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
index 49a48326061..3e03a677672 100644
--- a/cvat-ui/package.json
+++ b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
diff --git a/cvat-ui/src/components/tasks-page/task-item.tsx b/cvat-ui/src/components/tasks-page/task-item.tsx
index d5166ae3038..965ff952046 100644
--- a/cvat-ui/src/components/tasks-page/task-item.tsx
+++ b/cvat-ui/src/components/tasks-page/task-item.tsx
@@ -84,7 +84,7 @@ class TaskItemComponent extends React.PureComponent<TaskItemProps & RouteCompone
         // Progress appearence depends on number of jobs
         let progressColor = null;
         let progressText = null;
-        if (numOfCompleted === numOfJobs) {
+        if (numOfCompleted && numOfCompleted === numOfJobs) {
             progressColor = 'cvat-task-completed-progress';
             progressText = <Text strong className={progressColor}>Completed</Text>;
         } else if (numOfCompleted) {
diff --git a/cvat-ui/src/components/tasks-page/tasks-page.tsx b/cvat-ui/src/components/tasks-page/tasks-page.tsx
index 0f48bea9009..f14786eb7f1 100644
--- a/cvat-ui/src/components/tasks-page/tasks-page.tsx
+++ b/cvat-ui/src/components/tasks-page/tasks-page.tsx
@@ -76,12 +76,7 @@ function updateQuery(previousQuery: TasksQuery, searchString: string): TasksQuer
 
 class TasksPageComponent extends React.PureComponent<TasksPageProps & RouteComponentProps> {
     public componentDidMount(): void {
-        const {
-            gettingQuery,
-            location,
-            onGetTasks,
-        } = this.props;
-
+        const { gettingQuery, location, onGetTasks } = this.props;
         const query = updateQuery(gettingQuery, location.search);
         onGetTasks(query);
     }
@@ -90,8 +85,9 @@ class TasksPageComponent extends React.PureComponent<TasksPageProps & RouteCompo
         const {
             location,
             gettingQuery,
-            onGetTasks,
+            tasksFetching,
             numberOfHiddenTasks,
+            onGetTasks,
             hideEmptyTasks,
         } = this.props;
 
@@ -103,24 +99,26 @@ class TasksPageComponent extends React.PureComponent<TasksPageProps & RouteCompo
             return;
         }
 
-        if (numberOfHiddenTasks) {
-            message.destroy();
-            message.info(
-                <>
-                    <Text>
-                        Some tasks have not been showed because they do not have any data.
-                    </Text>
-                    <Button
-                        type='link'
-                        onClick={(): void => {
-                            hideEmptyTasks(false);
-                            message.destroy();
-                        }}
-                    >
-                        Show all
-                    </Button>
-                </>, 7,
-            );
+        if (prevProps.tasksFetching && !tasksFetching) {
+            if (numberOfHiddenTasks) {
+                message.destroy();
+                message.info(
+                    <>
+                        <Text>
+                            Some tasks are temporary hidden since they are without any data
+                        </Text>
+                        <Button
+                            type='link'
+                            onClick={(): void => {
+                                hideEmptyTasks(false);
+                                message.destroy();
+                            }}
+                        >
+                            Show all
+                        </Button>
+                    </>, 5,
+                );
+            }
         }
     }