diff --git a/app/src/main/java/devs/org/calculator/activities/MainActivity.kt b/app/src/main/java/devs/org/calculator/activities/MainActivity.kt
index e2a4d2d..8ff3f19 100644
--- a/app/src/main/java/devs/org/calculator/activities/MainActivity.kt
+++ b/app/src/main/java/devs/org/calculator/activities/MainActivity.kt
@@ -150,7 +150,7 @@ class MainActivity : AppCompatActivity(), DialogActionsCallback, DialogUtil.Dial
     }
 
     private fun clearDisplay() {
-        currentExpression = ""
+        currentExpression = "0"
         binding.total.text = ""
         lastWasOperator = false
         lastWasPercent = false
@@ -335,13 +335,17 @@ class MainActivity : AppCompatActivity(), DialogActionsCallback, DialogUtil.Dial
         }
 
         try {
-            if (currentExpression.isEmpty() ||
-                (isOperator(currentExpression.last().toString()) && currentExpression.last() != '%')) {
+            if (currentExpression.isEmpty()) {
                 binding.total.text = ""
                 return
             }
+
             var processedExpression = currentExpression.replace("×", "*")
 
+            if (isOperator(processedExpression.last().toString())) {
+                processedExpression = processedExpression.substring(0, processedExpression.length - 1)
+            }
+
             if (processedExpression.contains("%")) {
                 processedExpression = preprocessExpression(processedExpression)
             }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a9f27ad..0096c47 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -48,7 +48,7 @@
                     android:gravity="end|bottom"
                     android:autoSizeTextType="uniform"
                     android:padding="10dp"
-                    android:text=""
+                    android:text="0"
                     android:textSize="70sp"
                     tools:ignore="Suspicious0dp" />
             </LinearLayout>