diff --git a/src/app/(after-login)/epigrams/[id]/page.tsx b/src/app/(after-login)/epigrams/[id]/page.tsx
index aa329a1..d845fba 100644
--- a/src/app/(after-login)/epigrams/[id]/page.tsx
+++ b/src/app/(after-login)/epigrams/[id]/page.tsx
@@ -89,7 +89,7 @@ export default function Page() {
 
       {session ? (
         <Inner>
-          <EpigramComments id={id} />
+          <EpigramComments id={id} session={session} />
         </Inner>
       ) : (
         <div className='text-black-600 flex flex-col items-center justify-center gap-8 py-16'>
diff --git a/src/app/(after-login)/epigrams/_components/EpigramComments.tsx b/src/app/(after-login)/epigrams/_components/EpigramComments.tsx
index d9b1645..8b90720 100644
--- a/src/app/(after-login)/epigrams/_components/EpigramComments.tsx
+++ b/src/app/(after-login)/epigrams/_components/EpigramComments.tsx
@@ -2,7 +2,6 @@
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useQueryClient } from '@tanstack/react-query';
-import { useSession } from 'next-auth/react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 import { useCreateComment } from '@/apis/comment/comment.queries';
@@ -14,9 +13,15 @@ import type { FieldErrors } from 'react-hook-form';
 
 interface EpigramCommentsProps {
   id: Epigram['id'];
+  session?: {
+    user: {
+      nickname: string;
+      image: string;
+    };
+  };
 }
 
-export default function EpigramComments({ id }: EpigramCommentsProps) {
+export default function EpigramComments({ id, session }: EpigramCommentsProps) {
   const methods = useForm<CommentFormValues>({
     resolver: zodResolver(commentSchema),
     defaultValues: {
@@ -27,7 +32,6 @@ export default function EpigramComments({ id }: EpigramCommentsProps) {
 
   const queryClient = useQueryClient();
   const commentQueryParams = { limit: 4 };
-  const { data: session } = useSession();
 
   const {
     data: commentData,
@@ -78,16 +82,14 @@ export default function EpigramComments({ id }: EpigramCommentsProps) {
           onSubmit={methods.handleSubmit(handleCreateComment, handleCreateError)}
           className='border-t-0 px-0 !pt-0'
         >
-          <CommentForm
-            writer={
-              session?.user
-                ? { nickname: session.user.nickname, image: session.user.image }
-                : { nickname: '', image: '' }
-            }
-            isUpdatePending={isCreatePending}
-            handleSaveEdit={() => {}}
-            handleCancelEdit={() => methods.reset()}
-          />
+          {session?.user && (
+            <CommentForm
+              writer={{ nickname: session.user.nickname, image: session.user.image }}
+              isUpdatePending={isCreatePending}
+              handleSaveEdit={() => {}}
+              handleCancelEdit={() => methods.reset()}
+            />
+          )}
         </form>
       </FormProvider>
 
diff --git a/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx b/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx
index ad3a115..10c10f1 100644
--- a/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx
+++ b/src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx
@@ -5,7 +5,7 @@ type DetailContent = Pick<EpigramDetail, 'content' | 'author'>;
 export function DetailContent({ content, author }: DetailContent) {
   return (
     <>
-      <h2 className='font-iropke mb-4 text-2xl leading-relaxed break-keep whitespace-pre-wrap md:mb-6 lg:mb-8 lg:text-3xl'>
+      <h2 className='font-iropke mb-4 text-2xl leading-relaxed break-words break-keep whitespace-pre-wrap md:mb-6 lg:mb-8 lg:text-3xl'>
         {content}
       </h2>
       <div className='mb-8 flex justify-end lg:mb-9'>
diff --git a/src/components/Comment.tsx b/src/components/Comment.tsx
index a4c090a..a5fddd4 100644
--- a/src/components/Comment.tsx
+++ b/src/components/Comment.tsx
@@ -49,7 +49,7 @@ export default function Comment({
     commentInfoBtns: 'ml-auto flex gap-x-4',
     commentInfoBtn: 'cursor-pointer leading-normal underline underline-offset-3',
     commentContent:
-      'text-black-700 mt-2 text-[14px] leading-[1.7] break-keep md:mt-3 md:text-[16px] md:leading-relaxed lg:mt-4 lg:text-[20px]',
+      'text-black-700 mt-2 text-[14px] leading-[1.7] break-all md:mt-3 md:text-[16px] md:leading-relaxed lg:mt-4 lg:text-[20px]',
   };
 
   const CommentBody = () => (