diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 4f045a28061..690c79559af 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -268,6 +268,7 @@ public class DashboardSummary extends InstrumentedFragment
         mSummaryLoader.updateSummaryToCache(category);
         mStagingCategory = category;
         if (mSuggestionControllerMixin == null) {
+            mAdapter.setCategory(mStagingCategory);
             return;
         }
         if (mSuggestionControllerMixin.isSuggestionLoaded()) {
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index a1c8d67e034..d9c709e72e9 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -67,6 +67,8 @@ public class DashboardSummaryTest {
     private ConditionManager mConditionManager;
     @Mock
     private SummaryLoader mSummaryLoader;
+    @Mock
+    private SuggestionControllerMixin mSuggestionControllerMixin;
 
     private Context mContext;
     private DashboardSummary mSummary;
@@ -111,12 +113,31 @@ public class DashboardSummaryTest {
 
     @Test
     public void updateCategory_shouldGetCategoryFromFeatureProvider() {
+        ReflectionHelpers.setField(mSummary, "mSuggestionControllerMixin",
+                mSuggestionControllerMixin);
+
+        when(mSuggestionControllerMixin.isSuggestionLoaded()).thenReturn(true);
         doReturn(mock(Activity.class)).when(mSummary).getActivity();
         mSummary.onAttach(mContext);
         mSummary.updateCategory();
 
         verify(mSummaryLoader).updateSummaryToCache(nullable(DashboardCategory.class));
         verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
+        verify(mAdapter).setCategory(any());
+    }
+
+    @Test
+    public void updateCategory_shouldGetCategoryFromFeatureProvider_evenIfSuggestionDisabled() {
+        when(mFeatureFactory.suggestionsFeatureProvider.isSuggestionEnabled(any(Context.class)))
+                .thenReturn(false);
+
+        doReturn(mock(Activity.class)).when(mSummary).getActivity();
+        mSummary.onAttach(mContext);
+        mSummary.updateCategory();
+
+        verify(mSummaryLoader).updateSummaryToCache(nullable(DashboardCategory.class));
+        verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
+        verify(mAdapter).setCategory(any());
     }
 
     @Test