diff --git a/library/src/main/java/it/sephiroth/android/library/tooltip/Tooltip.java b/library/src/main/java/it/sephiroth/android/library/tooltip/Tooltip.java
index e28d644b..3a5b8302 100644
--- a/library/src/main/java/it/sephiroth/android/library/tooltip/Tooltip.java
+++ b/library/src/main/java/it/sephiroth/android/library/tooltip/Tooltip.java
@@ -288,7 +288,7 @@ public void onViewDetachedFromWindow(final View v) {
                         log(TAG, WARN, "[%d] skipped because activity is finishing...", mToolTipId);
                         return;
                     }
-                    if (Build.VERSION.SDK_INT >= 17 && activity.isDestroyed()) {
+                    if (Build.VERSION.SDK_INT >= 17 || activity.isDestroyed()) {
                         return;
                     }
                     onClose(false, false, true);