diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
index 320197f1..814ff646 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
@@ -35,6 +35,8 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 	}
 
 	override fun getValue(): Any? {
+        if (values.isEmpty()) { return null }
+        if (values.all { it.isEmpty() }) { return null }
 		return values
 	}