diff --git a/lawnchair/src/app/lawnchair/LawnchairAppWidgetHostView.kt b/lawnchair/src/app/lawnchair/LawnchairAppWidgetHostView.kt
index 1471dc9ea3..c9f7a6a822 100644
--- a/lawnchair/src/app/lawnchair/LawnchairAppWidgetHostView.kt
+++ b/lawnchair/src/app/lawnchair/LawnchairAppWidgetHostView.kt
@@ -2,8 +2,6 @@ package app.lawnchair
 
 import android.appwidget.AppWidgetProviderInfo
 import android.content.Context
-import android.os.Parcelable
-import android.util.SparseArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -46,11 +44,6 @@ class LawnchairAppWidgetHostView @JvmOverloads constructor(
         super.updateAppWidget(remoteViews)
     }
 
-    override fun dispatchRestoreInstanceState(container: SparseArray<Parcelable>?) {
-        if (customView != null) return
-        super.dispatchRestoreInstanceState(container)
-    }
-
     override fun getDefaultView(): View {
         if (customView != null) return getEmptyView()
         return super.getDefaultView()
diff --git a/lawnchair/src/app/lawnchair/smartspace/BcSmartspaceView.kt b/lawnchair/src/app/lawnchair/smartspace/BcSmartspaceView.kt
index d2c98d991e..5844a29853 100644
--- a/lawnchair/src/app/lawnchair/smartspace/BcSmartspaceView.kt
+++ b/lawnchair/src/app/lawnchair/smartspace/BcSmartspaceView.kt
@@ -39,6 +39,7 @@ class BcSmartspaceView @JvmOverloads constructor(
     override fun onFinishInflate() {
         super.onFinishInflate()
         viewPager = findViewById(R.id.smartspace_card_pager)
+        viewPager.isSaveEnabled = false
         indicator = findViewById(R.id.smartspace_page_indicator)
 
         viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {