diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index f16c55f..a60bcc3 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-07-20T06:36:39.946968600Z">
+        <DropdownSelection timestamp="2025-04-23T13:38:33.325921500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\rizky\.android\avd\Pixel_7_API_33.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\wisnu\.android\avd\Pixel_7_Pro_API_34.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/example/palmguardapp/ui/detection/DetectionFragment.kt b/app/src/main/java/com/example/palmguardapp/ui/detection/DetectionFragment.kt
index faa41e8..33315c7 100644
--- a/app/src/main/java/com/example/palmguardapp/ui/detection/DetectionFragment.kt
+++ b/app/src/main/java/com/example/palmguardapp/ui/detection/DetectionFragment.kt
@@ -53,7 +53,7 @@ class DetectionFragment : Fragment(R.layout.fragment_detection) {
                 navigateToDiagnoseDetail(data)
             }
 
-            fun onDeleteClicked(data: HistoryDiagnose) {
+            override fun onDeleteClicked(data: HistoryDiagnose) {
                 AlertDialog.Builder(requireContext())
                     .setTitle("Hapus Riwayat")
                     .setMessage("Apakah kamu yakin ingin menghapus riwayat ini?")
@@ -80,6 +80,15 @@ class DetectionFragment : Fragment(R.layout.fragment_detection) {
             viewModel.detectionList.collect { historyDiagnoses ->
                 Log.d("DetectionFragment", "Observing detection list. Count: ${historyDiagnoses.size}")
                 detectionAdapter.submitList(historyDiagnoses)
+
+                if (historyDiagnoses.isEmpty()) {
+                    binding.textViewEmptyHistory.visibility = View.VISIBLE
+                    binding.rvResultDetection.visibility = View.GONE
+                } else {
+                    binding.textViewEmptyHistory.visibility = View.GONE
+                    binding.rvResultDetection.visibility = View.VISIBLE
+                    detectionAdapter.submitList(historyDiagnoses)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/example/palmguardapp/ui/home/HomeFragment.kt b/app/src/main/java/com/example/palmguardapp/ui/home/HomeFragment.kt
index 54e44a2..50c6f0a 100644
--- a/app/src/main/java/com/example/palmguardapp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/example/palmguardapp/ui/home/HomeFragment.kt
@@ -314,6 +314,7 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
         val confidenceFloat = historyDiagnose.confidence.toFloatOrNull() ?: 0f
         binding.confidenceResultDiagnosis.text = "Confidence: %.1f%%".format(confidenceFloat)
         binding.cdHomeScreenAnalyze.visibility = View.VISIBLE
+        binding.tvHsHistoryEmpty.visibility = View.GONE
     }
 
 
diff --git a/app/src/main/res/layout/fragment_detection.xml b/app/src/main/res/layout/fragment_detection.xml
index c2c0276..60bd97e 100644
--- a/app/src/main/res/layout/fragment_detection.xml
+++ b/app/src/main/res/layout/fragment_detection.xml
@@ -48,6 +48,15 @@
             android:paddingTop="@dimen/margin_component"
             app:layout_constraintTop_toBottomOf="@id/dd_cont_title">
 
+            <TextView
+                android:id="@+id/textViewEmptyHistory"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="Belum Ada Riwayat"
+                android:textColor="@color/grayFont"
+                android:layout_gravity="center"
+                android:visibility="gone" />
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_result_detection"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 54f69b3..64bb3cf 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -266,7 +266,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cv_hs_detail_explanation_title">
-            
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -421,6 +421,17 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.card.MaterialCardView>
 
+        <TextView
+            android:id="@+id/tv_hs_history_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_component"
+            android:text="Belum Ada Riwayat Deteksi Terbaru"
+            android:textColor="@color/grayFont"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cv_hs_history_title" />
+
         <ProgressBar
             android:id="@+id/progress_result"
             android:layout_width="wrap_content"