diff --git a/poincare/src/expression.cpp b/poincare/src/expression.cpp
index 995229c39..b5352362e 100644
--- a/poincare/src/expression.cpp
+++ b/poincare/src/expression.cpp
@@ -467,7 +467,7 @@ int Expression::getPolynomialReducedCoefficients(const char * symbolName, Expres
 /* Units */
 
 bool Expression::hasUnit() const {
-  return !getUnit().isUndefined();
+  return recursivelyMatches([](const Expression e, Context * context) { return e.type() == ExpressionNode::Type::Unit; }, nullptr, false);
 }
 
 /* Complex */