diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt
index 990ee0aa..6b2d19b9 100644
--- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt
+++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt
@@ -3,16 +3,16 @@ package com.android.go.sopt.winey.presentation.main.feed.detail
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.android.go.sopt.winey.databinding.ItemDetailCommentEmptyBinding
+import com.android.go.sopt.winey.databinding.LayoutCommentEmptyBinding
 
 class CommentEmptyAdapter : RecyclerView.Adapter<CommentEmptyAdapter.CommentEmptyViewHolder>() {
 
-    class CommentEmptyViewHolder(binding: ItemDetailCommentEmptyBinding) :
+    class CommentEmptyViewHolder(binding: LayoutCommentEmptyBinding) :
         RecyclerView.ViewHolder(binding.root)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CommentEmptyViewHolder {
         return CommentEmptyViewHolder(
-            ItemDetailCommentEmptyBinding.inflate(
+            LayoutCommentEmptyBinding.inflate(
                 LayoutInflater.from(parent.context),
                 parent,
                 false
@@ -20,11 +20,11 @@ class CommentEmptyAdapter : RecyclerView.Adapter<CommentEmptyAdapter.CommentEmpt
         )
     }
 
-    override fun getItemCount(): Int = COMMENT_ITEM_COUNT
+    override fun getItemCount(): Int = EMPTY_ITEM_COUNT
 
     override fun onBindViewHolder(holder: CommentEmptyViewHolder, position: Int) {}
 
     companion object {
-        private const val COMMENT_ITEM_COUNT = 1
+        private const val EMPTY_ITEM_COUNT = 1
     }
 }
diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt
index 5536c6d3..032933c7 100644
--- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt
+++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt
@@ -79,11 +79,7 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
         }
     }
 
-    private fun initDetailFeedAdapter(detailFeed: DetailFeed?) {
-        if (detailFeed == null) {
-            Timber.e("DETAIL FEED IS NULL")
-            return
-        }
+    private fun initDetailFeedAdapter(detailFeed: DetailFeed) {
         _detailFeedAdapter =
             DetailFeedAdapter(
                 detailFeed,
@@ -236,25 +232,20 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
 
     private fun initCommentCreateButtonClickListener() {
         binding.tvCommentCreate.setOnClickListener {
-            checkEmptyCommentList()
             val content = binding.etComment.text.toString()
             viewModel.postComment(feedId, content)
         }
     }
 
-    private fun checkEmptyCommentList() {
-        if (commentAdapter.currentList.size == 0) {
-            binding.rvDetail.adapter = ConcatAdapter(detailFeedAdapter, commentAdapter)
-        }
-    }
-
     private fun initGetFeedDetailObserver() {
         viewModel.getFeedDetailState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> {
-                    val detailFeed = state.data
+                    val detailFeed = state.data ?: return@onEach
                     initDetailFeedAdapter(detailFeed)
-                    switchCommentContainer(detailFeed?.commentList)
+
+                    val commentList = detailFeed.commentList
+                    switchCommentContainer(commentList)
                 }
 
                 is UiState.Failure -> {
@@ -266,12 +257,7 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
         }.launchIn(lifecycleScope)
     }
 
-    private fun switchCommentContainer(commentList: List<Comment>?) {
-        if (commentList == null) {
-            Timber.e("DETAIL COMMENT LIST IS NULL")
-            return
-        }
-
+    private fun switchCommentContainer(commentList: List<Comment>) {
         if (commentList.isEmpty()) {
             binding.rvDetail.adapter = ConcatAdapter(detailFeedAdapter, commentEmptyAdapter)
         } else {
@@ -320,6 +306,11 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
                 when (state) {
                     is UiState.Success -> {
                         val comment = state.data ?: return@onEach
+
+                        if (isCommentListEmpty()) {
+                            updateRecyclerViewAdapter(ACTION_COMMENT_POST)
+                        }
+
                         val commentNumber = commentAdapter.addItem(comment)
                         detailFeedAdapter.updateCommentNumber(commentNumber.toLong())
                         binding.etComment.text.clear()
@@ -334,6 +325,21 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
             }.launchIn(lifecycleScope)
     }
 
+    private fun isCommentListEmpty() = commentAdapter.currentList.isEmpty()
+
+    private fun updateRecyclerViewAdapter(action: String) {
+        when (action) {
+            ACTION_COMMENT_POST ->
+                binding.rvDetail.adapter =
+                    ConcatAdapter(detailFeedAdapter, commentAdapter)
+
+            ACTION_COMMENT_DELETE -> {
+                binding.rvDetail.adapter =
+                    ConcatAdapter(detailFeedAdapter, commentEmptyAdapter)
+            }
+        }
+    }
+
     private fun initDeleteCommentStateObserver() {
         viewModel.deleteCommentState.flowWithLifecycle(lifecycle)
             .onEach { state ->
@@ -341,10 +347,19 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
                     is UiState.Success -> {
                         if (state.data == null) return@onEach
 
-                        val commentNumber = commentAdapter.deleteItem(state.data.commentId)
+                        val commentId = state.data.commentId
+                        val commentNumber = commentAdapter.deleteItem(commentId)
                         detailFeedAdapter.updateCommentNumber(commentNumber.toLong())
 
-                        wineySnackbar(binding.root, true, stringOf(R.string.snackbar_comment_delete_success))
+                        if (isCommentNumberZero(commentNumber)) {
+                            updateRecyclerViewAdapter(ACTION_COMMENT_DELETE)
+                        }
+
+                        wineySnackbar(
+                            binding.root,
+                            true,
+                            stringOf(R.string.snackbar_comment_delete_success)
+                        )
                     }
 
                     is UiState.Failure -> {
@@ -357,6 +372,8 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
             }.launchIn(lifecycleScope)
     }
 
+    private fun isCommentNumberZero(commentNumber: Int) = commentNumber == 0
+
     private fun navigateToMainWithBundle(extraKey: String) {
         Intent(this, MainActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
@@ -384,5 +401,8 @@ class DetailActivity : BindingActivity<ActivityDetailBinding>(R.layout.activity_
 
         private const val TARGET_DETAIL_FEED = "detailFeed"
         private const val TARGET_COMMENT = "comment"
+
+        private const val ACTION_COMMENT_POST = "POST"
+        private const val ACTION_COMMENT_DELETE = "DELETE"
     }
 }
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
deleted file mode 100644
index 303a09b0..00000000
--- a/app/src/main/res/layout/fragment_detail.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="vm"
-            type="com.android.go.sopt.winey.presentation.main.feed.detail.DetailViewModel" />
-
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_app_bar"
-            android:layout_width="0dp"
-            android:layout_height="56dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/iv_detail_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginVertical="4dp"
-                android:paddingHorizontal="12dp"
-                android:paddingVertical="12dp"
-                android:src="@drawable/ic_myfeed_back"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_detail_comment"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:orientation="vertical"
-            android:overScrollMode="never"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@id/fl_comment_input"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cl_app_bar" />
-
-        <FrameLayout
-            android:id="@+id/fl_comment_input"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@color/gray_100"
-            android:padding="10dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/shape_white_fill_10_rect"
-                android:padding="12dp">
-
-                <EditText
-                    android:id="@+id/et_comment"
-                    style="?editTextStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="4dp"
-                    android:background="@android:color/transparent"
-                    android:hint="@string/comment_hint"
-                    android:importantForAutofill="no"
-                    android:inputType="text|textMultiLine"
-                    android:maxLength="@{vm.MAX_COMMENT_LENGTH}"
-                    android:scrollbars="vertical"
-                    android:text="@={vm._comment}"
-                    android:textAppearance="@style/TextAppearance.WINEY.body2_m_15"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/tv_comment_counter"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/tv_comment_create"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top|end"
-                    android:text="@string/comment_upload_btn_text"
-                    android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
-                    android:textColor="@color/purple_400"
-                    android:visibility="@{vm.isValidComment ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/tv_comment_counter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{@string/comment_counter(vm._comment.length)}"
-                    android:textAppearance="@style/TextAppearance.WINEY.detail_m_11"
-                    android:textColor="?colorError"
-                    android:visibility="@{vm.isLongText ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    tools:text="@string/comment_counter_preview" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </FrameLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/item_detail_comment_empty.xml b/app/src/main/res/layout/layout_comment_empty.xml
similarity index 100%
rename from app/src/main/res/layout/item_detail_comment_empty.xml
rename to app/src/main/res/layout/layout_comment_empty.xml