diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
index 82e30fb1..624f8ce0 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
@@ -37,6 +37,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 	private val handler: Handler = Handler()
 	private val refreshTimer: Runnable = object : Runnable {
 		override fun run() {
+			// Refresh header each 30 seconds
 			sessionAdapter.notifyItemChanged(0)
 			handler.postDelayed(this, 30000)
 		}
@@ -84,13 +85,13 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 				requireContext(),
 				row,
 				this,
-				currentSession.timeFrame?.startDate
+				currentSession.timeFrame?.startDate ?: Date()
 			)
 			SessionRow.END_DATE -> DateTimePickerManager.create(
 				requireContext(),
 				row,
 				this,
-				currentSession.timeFrame?.endDate
+				currentSession.timeFrame?.endDate ?: currentSession.timeFrame?.startDate ?: Date()
 			)
 			else -> BottomSheetFragment.create(fragmentManager, row, this, data)
 		}