diff --git a/src/Components/Resource/CommentSection.tsx b/src/Components/Resource/CommentSection.tsx
index 5a3d94687b3..43775ace5aa 100644
--- a/src/Components/Resource/CommentSection.tsx
+++ b/src/Components/Resource/CommentSection.tsx
@@ -86,7 +86,9 @@ export const Comment = ({
 }: IComment) => (
   <div className="mt-4 flex w-full flex-col rounded-lg border border-secondary-300 bg-white p-4 text-secondary-800">
     <div className="flex w-full">
-      <p className="text-justify">{comment}</p>
+      <p className="whitespace-normal break-words break-all text-justify">
+        {comment}
+      </p>
     </div>
     <div className="mt-3">
       <span className="text-xs text-secondary-500">
diff --git a/src/Components/Shifting/CommentsSection.tsx b/src/Components/Shifting/CommentsSection.tsx
index ff826bec63f..bf6169c58d4 100644
--- a/src/Components/Shifting/CommentsSection.tsx
+++ b/src/Components/Shifting/CommentsSection.tsx
@@ -95,7 +95,9 @@ export const Comment = ({
       className="mt-4 flex w-full flex-col rounded-lg border border-secondary-300 bg-white p-4 text-secondary-800"
     >
       <div className="flex w-full">
-        <p className="text-justify">{comment}</p>
+        <p className="whitespace-normal break-words break-all text-justify">
+          {comment}
+        </p>
       </div>
       <div className="mt-3">
         <span className="text-xs text-secondary-500">