diff --git a/src/entities/task/ui/task/components/task-buttons/components/task-buttons-recipient/index.tsx b/src/entities/task/ui/task/components/task-buttons/components/task-buttons-recipient/index.tsx
index 2c470eb4..9ec9760b 100644
--- a/src/entities/task/ui/task/components/task-buttons/components/task-buttons-recipient/index.tsx
+++ b/src/entities/task/ui/task/components/task-buttons/components/task-buttons-recipient/index.tsx
@@ -141,7 +141,7 @@ export const TaskButtonsRecipient = ({
           modalContent={
             <ModalContent
               type={
-                isPageActive && !volunteer
+                isPageActive && !recipientReport
                   ? modalContentType.conflict
                   : isPageActive
                   ? modalContentType.admin
diff --git a/src/entities/task/ui/task/components/task-buttons/components/task-buttons-volunteer/index.tsx b/src/entities/task/ui/task/components/task-buttons/components/task-buttons-volunteer/index.tsx
index 3ebc8485..a632a902 100644
--- a/src/entities/task/ui/task/components/task-buttons/components/task-buttons-volunteer/index.tsx
+++ b/src/entities/task/ui/task/components/task-buttons/components/task-buttons-volunteer/index.tsx
@@ -100,7 +100,7 @@ export const TaskButtonsVolunteer = ({
           modalContent={
             <ModalContent
               type={
-                isPageActive && !volunteer
+                isPageActive && !volunteerReport
                   ? modalContentType.conflict
                   : isPageActive
                   ? modalContentType.admin
@@ -122,9 +122,8 @@ export const TaskButtonsVolunteer = ({
             buttonType={taskButtonType.conflict}
             disabledColor={
               !volunteer ||
-              (volunteerReport && isPageActive) ||
-              (recipientReport && isPageActive) ||
-              isPageActive
+              (!!volunteerReport && isPageActive) ||
+              (!!recipientReport && isPageActive)
             }
           />
         </ButtonWithModal>
diff --git a/src/widgets/task-buttons-content/components/conflict-modal-content/index.tsx b/src/widgets/task-buttons-content/components/conflict-modal-content/index.tsx
index dac52ca7..d1372dd4 100644
--- a/src/widgets/task-buttons-content/components/conflict-modal-content/index.tsx
+++ b/src/widgets/task-buttons-content/components/conflict-modal-content/index.tsx
@@ -12,7 +12,7 @@ import styles from './styles.module.css';
 
 export const ConflictModalContent = ({
   active = true,
-  conflict = true,
+  conflict,
   taskId,
   userRole,
   volunteer,
diff --git a/src/widgets/task-buttons-content/index.tsx b/src/widgets/task-buttons-content/index.tsx
index 69ac76c4..98e5485f 100644
--- a/src/widgets/task-buttons-content/index.tsx
+++ b/src/widgets/task-buttons-content/index.tsx
@@ -44,7 +44,7 @@ export const ModalContent = ({
         <CloseModalContent date={date} userRole={userRole} taskId={taskId} />
       );
     case modalContentType.conflict:
-      return <ConflictModalContent userRole={userRole} volunteer={volunteer} />;
+      return <ConflictModalContent userRole={userRole} volunteer={volunteer} taskId={taskId} />;
     case modalContentType.confirm:
       return <ConfirmModalContent userRole={userRole} volunteer={volunteer} />;
     case modalContentType.admin: