diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
index 6a596249..16af5c18 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -208,7 +208,7 @@ public class TraditionalT9 extends MainViewHandler {
 
 	protected void onZombie() {
 		if (isDead) {
-			Logger.w(LOG_TAG, "===> Already dead. Nothing to do.");
+			Logger.w(LOG_TAG, "===> Already dead. Cannot kill self.");
 			return;
 		}
 
@@ -232,8 +232,10 @@ public class TraditionalT9 extends MainViewHandler {
 
 	@Override
 	public void onDestroy() {
-		cleanUp();
-		isDead = true;
+		if (!isDead) {
+			cleanUp();
+			isDead = true;
+		}
 		super.onDestroy();
 		Logger.d(LOG_TAG, "===> Shutdown completed");
 	}