diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 9b1e41e..cf999e7 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -181,6 +181,7 @@
     public void onResume() {
         Trace.beginSection(TAG + " onResume");
         super.onResume();
+
         mActionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
         if (getUserVisibleHint()) {
             sendScreenViewForCurrentPosition();
@@ -304,7 +305,12 @@
         if (hasActiveVoicemailProvider != mHasActiveVoicemailProvider) {
             mHasActiveVoicemailProvider = hasActiveVoicemailProvider;
             mViewPagerAdapter.notifyDataSetChanged();
-            mViewPagerTabs.updateTab(TAB_INDEX_VOICEMAIL);
+
+            if (hasActiveVoicemailProvider) {
+                mViewPagerTabs.updateTab(TAB_INDEX_VOICEMAIL);
+            } else {
+                mViewPagerTabs.removeTab(TAB_INDEX_VOICEMAIL);
+            }
 
             mPrefs.edit()
                   .putBoolean(VisualVoicemailEnabledChecker.PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER,
