diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
index 5058bc22..6ebe1ff4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
@@ -210,7 +210,11 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
 
 	private fun readRowRepresentation(): MutableList<RowRepresentable> {
 		val rows: MutableList<RowRepresentable> = mutableListOf()
-		rows.add(HandRowType.COMMENT)
+
+		if (this.handHistory.comment?.isNotEmpty() == true) {
+			rows.add(HandRowType.COMMENT)
+		}
+
 		rows.add(CustomizableRowRepresentable(customViewType = HandRowType.HEADER, resId = R.string.settings, value = ""))
 
 		rows.add(HandRowType.PLAYER_NUMBER)
@@ -265,9 +269,7 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
 
 		val rows: MutableList<RowRepresentable> = mutableListOf()
 
-		if (this.handHistory.comment?.isNotBlank() == true) {
-			rows.add(HandRowType.COMMENT)
-		}
+		rows.add(HandRowType.COMMENT)
 
 //		rows.add(CustomizableRowRepresentable(customViewType = HandRowType.HEADER, resId = R.string.settings, value = ""))