diff --git a/radio/src/gui/colorlcd/model_curves.cpp b/radio/src/gui/colorlcd/model_curves.cpp
index 358a47006..f1ea93ca2 100644
--- a/radio/src/gui/colorlcd/model_curves.cpp
+++ b/radio/src/gui/colorlcd/model_curves.cpp
@@ -108,8 +108,10 @@ class CurveEditWindow : public Page
                        }
                        SET_DIRTY();
                        curveEdit->updatePreview();
-                       curveDataEdit->clear();
-                       curveDataEdit->update();
+                       if (curveDataEdit) {
+                         curveDataEdit->clear();
+                         curveDataEdit->update();
+                       }
                      }
                  });
 
@@ -132,8 +134,10 @@ class CurveEditWindow : public Page
                                        curve.points = newValue;
                                        SET_DIRTY();
                                        curveEdit->updatePreview();
-                                       curveDataEdit->clear();
-                                       curveDataEdit->update();
+                                       if (curveDataEdit) {
+                                         curveDataEdit->clear();
+                                         curveDataEdit->update();
+                                       }
                                      }
                                  });
       edit->setSuffix(STR_PTS);