diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
index 70c9b8fa..69783e62 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
@@ -147,6 +147,11 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
 
         secondValue = getSecondValue()
         calculateResult()
+        if ((lastOperation == DIVIDE || lastOperation == PERCENT) && secondValue == 0.0) {
+            lastKey = DIGIT
+            return
+        }
+
         lastKey = EQUALS
     }