diff --git a/apps/shared/cartesian_function.cpp b/apps/shared/cartesian_function.cpp
index c5fd33fb9..1e6245318 100644
--- a/apps/shared/cartesian_function.cpp
+++ b/apps/shared/cartesian_function.cpp
@@ -109,6 +109,10 @@ CartesianFunction::PlotType CartesianFunction::plotType() const {
 void CartesianFunction::setPlotType(PlotType plotType) {
   /* Reset memoized layout. */
   m_model.tidy();
+  double tMin = plotType == PlotType::Cartesian ? -INFINITY : 0.0;
+  double tMax = plotType == PlotType::Cartesian ? INFINITY : 360.0;
+  setTMin(tMin);
+  setTMax(tMax);
   return recordData()->setPlotType(plotType);
 }
 
diff --git a/apps/shared/cartesian_function.h b/apps/shared/cartesian_function.h
index 2565dcd6c..92bdfbd16 100644
--- a/apps/shared/cartesian_function.h
+++ b/apps/shared/cartesian_function.h
@@ -58,8 +58,8 @@ private:
       FunctionRecordDataBuffer(color),
       m_plotType(PlotType::Cartesian),
       m_displayDerivative(false),
-      m_tMin(0.0),
-      m_tMax(396.0) // TODO LEA RUBEN
+      m_tMin(-INFINITY),
+      m_tMax(INFINITY)
     {}
     PlotType plotType() const { return m_plotType; }
     void setPlotType(PlotType plotType) { m_plotType = plotType; }