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 83ba73b6..6379eae1 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 android.widget.Toast
 import androidx.core.view.isVisible
 import io.realm.RealmResults
 import io.realm.Sort
@@ -20,6 +21,7 @@ import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
 import net.pokeranalytics.android.util.Preferences
+import java.text.SimpleDateFormat
 import java.util.*
 
 class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
@@ -67,12 +69,27 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 
 		disclaimerContainer.isVisible = Preferences.shouldShowDisclaimer(requireContext())
 
+		val sdf = SimpleDateFormat("dd/M/yyyy hh:mm")
+		val betaLimitDate = sdf.parse("17/7/2019 10:00")
+
 		newCashGame.setOnClickListener {
+
+			if (Date().after(betaLimitDate)) {
+				this.showEndOfBetaMessage()
+				return@setOnClickListener
+			}
+
 			SessionActivity.newInstance(requireContext(), false)
 			newSessionCreated = true
 		}
 
 		newTournament.setOnClickListener {
+
+			if (Date().after(betaLimitDate)) {
+				this.showEndOfBetaMessage()
+				return@setOnClickListener
+			}
+
 			SessionActivity.newInstance(requireContext(), true)
 			newSessionCreated = true
 		}
@@ -84,6 +101,11 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 
 	}
 
+	private fun showEndOfBetaMessage() {
+		Toast.makeText(context, "Beta has ended. Please update with the Google Play version", Toast.LENGTH_LONG).show()
+
+	}
+
 	/**
 	 * Init data
 	 */