diff --git a/apps/solver/equation_store.cpp b/apps/solver/equation_store.cpp
index b7b444985..2b1ac89af 100644
--- a/apps/solver/equation_store.cpp
+++ b/apps/solver/equation_store.cpp
@@ -174,7 +174,7 @@ EquationStore::Error EquationStore::exactSolve(Poincare::Context * context) {
   }
   /* Turn the results in layouts */
   int solutionIndex = 0;
-  int initialNumberOfSolutions = m_numberOfSolutions;
+  int initialNumberOfSolutions = m_numberOfSolutions <= k_maxNumberOfExactSolutions ? m_numberOfSolutions : -1;
   // We iterate through the solutions and the potential delta
   for (int i = 0; i < initialNumberOfSolutions+1; i++) {
     if (!exactSolutions[i].isUninitialized()) {