diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
index 57f32645..f5e5b661 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
@@ -92,13 +92,15 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 
 		dataSetList.firstOrNull()?.let { dataSet ->
 
-			this.legendView.prepareWithStat(this.stat, dataSet.entryCount)
-
 			// initialize chart
 			this.chartContainer.removeAllViews()
 			this.chartView = when (dataSet) {
-				is LineDataSet -> LineChart(context)
+				is LineDataSet -> {
+					this.legendView.prepareWithStat(this.stat, dataSet.entryCount)
+					LineChart(context)
+				}
 				is BarDataSet -> {
+					this.legendView.prepareWithStat(this.stat)
 					val barChart = BarChart(context)
 					if (stat.showXAxisZero) {
 						barChart.xAxis.axisMinimum = 0.0f
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt
index 0cbcd77b..9d0a26c9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt
@@ -49,7 +49,7 @@ class LegendView : FrameLayout {
 	/**
 	 * Set the stat data to the view
 	 */
-	fun prepareWithStat(stat: Stat, counter: Int) {
+	fun prepareWithStat(stat: Stat, counter: Int? = null) {
 
 		if (stat.significantIndividualValue) {
 			this.stat1Name.text = stat.localizedTitle(context)
@@ -60,9 +60,12 @@ class LegendView : FrameLayout {
 			this.stat2Value.isVisible = false
 		}
 
-		val counterText = "$counter ${context.getString(R.string.sessions)}"
-		this.counter.text = counterText
-		this.counter.isVisible = stat.shouldShowNumberOfSessions
+		counter?.let {
+			val counterText = "$it ${context.getString(R.string.sessions)}"
+			this.counter.text = counterText
+			this.counter.isVisible = stat.shouldShowNumberOfSessions
+		}
+
 
 	}