diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 4d5e19299e5c..1a25e5bbf223 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -83,7 +83,11 @@ function OptionRowLHN(props) {
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
 
     const hasBrickError = optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
-    const shouldShowGreenDotIndicator = !hasBrickError && (optionItem.isUnreadWithMention || (optionItem.hasOutstandingIOU && !optionItem.isIOUReportOwner));
+    const shouldShowGreenDotIndicator =
+        !hasBrickError &&
+        (optionItem.isUnreadWithMention ||
+            (optionItem.hasOutstandingIOU && !optionItem.isIOUReportOwner) ||
+            (optionItem.isTaskReport && optionItem.isTaskAssignee && !optionItem.isTaskCompleted));
 
     /**
      * Show the ReportActionContextMenu modal popover.
diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js
index a44c841b87da..001ed2b10bdd 100644
--- a/src/components/TaskHeader.js
+++ b/src/components/TaskHeader.js
@@ -2,7 +2,6 @@ import React, {useEffect} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
-import _ from 'underscore';
 import reportPropTypes from '../pages/reportPropTypes';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import * as ReportUtils from '../libs/ReportUtils';
@@ -39,7 +38,7 @@ function TaskHeader(props) {
     const assigneeName = ReportUtils.getDisplayNameForParticipant(props.report.managerID);
     const assigneeAvatar = UserUtils.getAvatar(lodashGet(props.personalDetails, [props.report.managerID, 'avatar']), props.report.managerID);
     const isOpen = props.report.stateNum === CONST.REPORT.STATE_NUM.OPEN && props.report.statusNum === CONST.REPORT.STATUS.OPEN;
-    const isCompleted = props.report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.report.statusNum === CONST.REPORT.STATUS.APPROVED;
+    const isCompleted = ReportUtils.isTaskCompleted(props.report);
 
     useEffect(() => {
         TaskUtils.setTaskReport(props.report);
@@ -60,7 +59,7 @@ function TaskHeader(props) {
                     >
                         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.pv3]}>
                             <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                {!_.isEmpty(props.report.managerID) && (
+                                {props.report.managerID && props.report.managerID > 0 && (
                                     <>
                                         <Avatar
                                             source={assigneeAvatar}
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 1af14aa1d2a1..02c3308898f8 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -143,6 +143,26 @@ function isTaskReport(report) {
     return lodashGet(report, 'type') === CONST.REPORT.TYPE.TASK;
 }
 
+/**
+ * Checks if a task is completed
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function isTaskCompleted(report) {
+    return lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.SUBMITTED && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.APPROVED;
+}
+
+/**
+ * Checks if the current user is assigned to the task report
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function isTaskAssignee(report) {
+    return lodashGet(report, 'managerEmail') === currentUserEmail;
+}
+
 /**
  * Checks if a report is an IOU or expense report.
  *
@@ -2296,6 +2316,8 @@ export {
     isExpenseReport,
     isIOUReport,
     isTaskReport,
+    isTaskCompleted,
+    isTaskAssignee,
     isMoneyRequestReport,
     chatIncludesChronos,
     getNewMarkerReportActionID,
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 31155a11232e..3d3a67604485 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -183,7 +183,7 @@ function getOrderedReportIDs(reportIDFromRoute) {
             return;
         }
 
-        if (ReportUtils.isTaskReport(report) && report.stateNum !== CONST.REPORT.STATE.OPEN && report.statusNum !== CONST.REPORT.STATUS.OPEN) {
+        if (ReportUtils.isTaskReport(report) && ReportUtils.isTaskCompleted(report)) {
             archivedReports.push(report);
             return;
         }
@@ -266,6 +266,10 @@ function getOptionData(reportID) {
     result.isThread = ReportUtils.isThread(report);
     result.isChatRoom = ReportUtils.isChatRoom(report);
     result.isTaskReport = ReportUtils.isTaskReport(report);
+    if (result.isTaskReport) {
+        result.isTaskCompleted = ReportUtils.isTaskCompleted(report);
+        result.isTaskAssignee = ReportUtils.isTaskAssignee(report);
+    }
     result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
     result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index f60aa051035d..4003ba8002f0 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -308,8 +308,9 @@ function editTaskAndNavigate(report, ownerEmail, ownerAccountID, {title, descrip
     // If we make a change to the assignee, we want to add a comment to the assignee's chat
     let optimisticAssigneeAddComment;
     let assigneeChatReportID;
-    if (assigneeAccountID && assigneeAccountID !== report.managerID) {
+    if (assigneeAccountID && assigneeAccountID !== report.managerID && assigneeAccountID !== ownerAccountID) {
         assigneeChatReportID = ReportUtils.getChatByParticipants([assigneeAccountID]).reportID;
+
         if (assigneeChatReportID !== report.parentReportID.toString()) {
             optimisticAssigneeAddComment = ReportUtils.buildOptimisticTaskCommentReportAction(
                 report.reportID,
@@ -493,7 +494,7 @@ function setAssigneeValue(assignee, assigneeAccountID, shareDestination, isCurre
     }
 
     // This is only needed for creation of a new task and so it should only be stored locally
-    Onyx.merge(ONYXKEYS.TASK, {assignee, newAssigneeAccountID});
+    Onyx.merge(ONYXKEYS.TASK, {assignee, assigneeAccountID: newAssigneeAccountID});
 }
 
 /**