diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
index 6134b12c..a3642129 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
@@ -219,8 +219,11 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
                 mActionBar.setTitle(getPaneTitle(mPane));
         }
 
-        if (!isDrawerOpened() && (mDesktopMode || mPane == Pane.MAP))
-            mActionBar.setSubtitle(mHighlighter);
+        if (mHighlighter != null && !isDrawerOpened() && (mDesktopMode || mPane == Pane.MAP))
+            if (!mActionBar.equals("No Highlights"))
+                mActionBar.setSubtitle(mHighlighter);
+            else
+                mActionBar.setSubtitle(null);
         else
             mActionBar.setSubtitle(null);