diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
index 7b2aafda..a307e593 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import io.realm.RealmResults
 import io.realm.Sort
@@ -91,7 +92,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 	 * Init data
 	 */
 	private fun initData() {
-		realmSessions = getRealm().where<Session>().findAll().sort("timeFrame.startDate", Sort.DESCENDING)
+		realmSessions = getRealm().where<Session>().findAll().sort("creationDate", Sort.DESCENDING)
 
 		val viewManager = SmoothScrollLinearLayoutManager(requireContext())
 		historyAdapter = RowRepresentableAdapter(this, this)
@@ -114,6 +115,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 		rows.clear()
 		sessions.clear()
 		sessions.addAll(getRealm().copyFromRealm(realmSessions))
+		noSessionFound.isVisible = sessions.isEmpty()
 
 		GlobalScope.launch {
 
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index e4ab0748..5651a39a 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -7,71 +7,6 @@
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.HomeActivity">
 
-	<!--
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newSession"
-		android:layout_width="48dp"
-		android:layout_height="48dp"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_cash_game"
-		android:visibility="gone"
-		app:layout_constraintEnd_toStartOf="@+id/newTournament"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newTournament"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_tournoi"
-		android:visibility="gone"
-		app:layout_constraintEnd_toStartOf="@+id/newHand"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/newSession"
-		app:layout_constraintTop_toTopOf="@+id/newSession" />
-
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newHand"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_hand"
-		android:visibility="gone"
-		app:layout_constraintEnd_toStartOf="@+id/newTransaction"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/newTournament"
-		app:layout_constraintTop_toTopOf="@+id/newSession" />
-
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newTransaction"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginEnd="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_transaction"
-		android:visibility="gone"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/newHand"
-		app:layout_constraintTop_toTopOf="@+id/newSession" />
-
-	-->
-
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/newCashGame"
 		style="@style/PokerAnalyticsTheme.Button"
@@ -89,7 +24,6 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
 
-
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/newTournament"
 		style="@style/PokerAnalyticsTheme.Button"
@@ -106,7 +40,6 @@
 		app:layout_constraintStart_toEndOf="@+id/newCashGame"
 		app:layout_constraintTop_toTopOf="parent" />
 
-
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
@@ -118,4 +51,23 @@
 		app:layout_constraintTop_toBottomOf="@+id/newCashGame"
 		tools:listitem="@layout/row_history_session" />
 
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/noSessionFound"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		style="@style/PokerAnalyticsTheme.TextView.Header"
+		android:textSize="24sp"
+		android:text="@string/no_sessions"
+		android:visibility="gone"
+		tools:visibility="visible"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.5" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file