diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt
index 28c8c2b6..92bb224b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/EditorViewModel.kt
@@ -423,6 +423,12 @@ class EditorViewModel : ViewModel(), RowRepresentableDataSource, CardCentralizer
 		if (playerCount != this.handHistory.numberOfPlayers) {
 			this.clearSelection() // avoid crashes
 			this.handSetup.tableSize = playerCount
+
+			if (this.handSetup.straddlePositions.isNotEmpty()) { // avoid possible crashes
+				this.handSetup.clearStraddles()
+				this.straddlePositions.clear()
+			}
+
 			this.handHistory.configure(this.handSetup)
 			load()
 		}