diff --git a/main/astrodatagui/AstrodataGUI.py b/main/astrodatagui/AstrodataGUI.py
index 2de9790..a593d7e 100644
--- a/main/astrodatagui/AstrodataGUI.py
+++ b/main/astrodatagui/AstrodataGUI.py
@@ -282,7 +282,11 @@ class AstrodataGUI(QtWidgets.QMainWindow):
 
     def updateFlaredetectionWidgetBin(self):
         binEnabled = self.cbPlotBinEnable.isChecked()
-        binSize = int(self.edBinSize.text())
+        try:
+            binSize = int(self.edBinSize.text())
+        except:
+            print(f"Invalid bin size detected: {self.edBinSize.text()}, setting None")
+            binSize = None
         self.flaredetectorPreview.setBinState(binEnabled, binSize)
 
     def updateFlaredetectionWidgetFlatten(self):
diff --git a/main/astrodatagui/astrodatagui.ui b/main/astrodatagui/astrodatagui.ui
index 4d671ac..e58689f 100644
--- a/main/astrodatagui/astrodatagui.ui
+++ b/main/astrodatagui/astrodatagui.ui
@@ -520,7 +520,7 @@
                          </size>
                         </property>
                         <property name="text">
-                         <string>1</string>
+                         <string>None</string>
                         </property>
                        </widget>
                       </item>
diff --git a/main/astrodatagui/ui/FlaredetectorWidget.py b/main/astrodatagui/ui/FlaredetectorWidget.py
index ead1b23..b8782a1 100644
--- a/main/astrodatagui/ui/FlaredetectorWidget.py
+++ b/main/astrodatagui/ui/FlaredetectorWidget.py
@@ -24,7 +24,7 @@ class FlaredetectorWidget(QtWidgets.QWidget):
         self.NormalizeState = {"Enabled": False, "Scale": "unscaled"}
         self.RemoveOutliersState = {"Enabled": False, "Sigma": 5.0}
         self.RemoveNansState = {"Enabled": False}
-        self.BinState = {"Enabled": False, "Size": 1}
+        self.BinState = {"Enabled": False, "Size": None}
         self.FlattenState = {"Enabled": False, "WindowLength": 101, "PolynomialOrder": 2}
         self.FoldState = {"Enabled": False, "Period": 1, "EpochTime": 0}
         self.PeriodogramState = {"Enabled": False, "Method": "lombscargle"}
@@ -62,11 +62,11 @@ class FlaredetectorWidget(QtWidgets.QWidget):
         self.RemoveNansState["Enabled"] = enabled
         self.updatePlot()
 
-    def setBinState(self, enabled: bool, binSize: int):
+    def setBinState(self, enabled: bool, binSize):
         self.BinState["Enabled"] = enabled
-        if(binSize < 0):
-            print(f"Negative binSize detected, setting default 1")
-            binSize = 1
+        if(binSize is not None and binSize < 0):
+            print(f"Negative binSize detected, setting default None")
+            binSize = None
         self.BinState["Size"] = binSize
         self.updatePlot()
 
@@ -124,7 +124,7 @@ class FlaredetectorWidget(QtWidgets.QWidget):
         if(self.RemoveNansState["Enabled"]):
             lc = lc.remove_nans()
             label += " - no nans"
-        if(self.BinState["Enabled"]):
+        if(self.BinState["Enabled"] and self.BinState["Size"] is not None):
             lc = lc.bin(time_bin_size=self.BinState["Size"])
             label += " - binned"
         if(self.FlattenState["Enabled"]):