diff --git a/src/displayapp/screens/Calculator.cpp b/src/displayapp/screens/Calculator.cpp
index e5d38810..a311ee0f 100644
--- a/src/displayapp/screens/Calculator.cpp
+++ b/src/displayapp/screens/Calculator.cpp
@@ -199,8 +199,10 @@ void Calculator::HandleInput() {
       NRF_LOG_INFO(". value: %" PRId64, value);
       NRF_LOG_INFO(". result: %" PRId64, result);
 
-      operation = ' ';
-      UpdateOperation();
+      if (value == 0) {
+        operation = ' ';
+        UpdateOperation();
+      }
       break;
 
     case '=':