diff --git a/calligraphy/src/main/java/io/github/inflationx/calligraphy3/Calligraphy.java b/calligraphy/src/main/java/io/github/inflationx/calligraphy3/Calligraphy.java
index caf8b66..b7e045d 100644
--- a/calligraphy/src/main/java/io/github/inflationx/calligraphy3/Calligraphy.java
+++ b/calligraphy/src/main/java/io/github/inflationx/calligraphy3/Calligraphy.java
@@ -250,7 +250,12 @@ private ToolbarLayoutListener(final Calligraphy calligraphy,
                 }
             }
             removeSelf(toolbar);
-            toolbar.setSubtitle(originalSubTitle);
+            String subTitle = toolbar.getSubtitle().toString();
+            if (BLANK.equals(subTitle)) {
+                toolbar.setSubtitle(originalSubTitle);
+            } else {
+                toolbar.setSubtitle(subTitle);
+            }
         }
 
         private void removeSelf(final Toolbar toolbar) {// Our dark deed is done