diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt
index 494d2978..af8c7897 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt
@@ -52,11 +52,13 @@ class HandSetup {
 		if (attached) {
 			this.session = session
 		}
+		if (session.endDate == null) {
+			this.game = session.game // we don't want to force the max number of cards if unsure
+		}
 		this.type = session.sessionType
 		this.smallBlind = session.cgSmallBlind
 		this.bigBlind = session.cgBigBlind
 		this.tableSize = session.tableSize
-		this.game = session.game
 	}
 
 	var type: Session.Type? = null