diff --git a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryApplication.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryApplication.kt
index 8c9d42c053d28..36b58ad794dc3 100644
--- a/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryApplication.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryApplication.kt
@@ -22,6 +22,6 @@ import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
 class GalleryApplication : Application() {
     override fun onCreate() {
         super.onCreate()
-        SpaEnvironmentFactory.instance = GallerySpaEnvironment
+        SpaEnvironmentFactory.reset(GallerySpaEnvironment)
     }
 }
\ No newline at end of file
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
index e0835ea61a7b2..5baee4fb4acc0 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
@@ -24,19 +24,17 @@ private const val TAG = "SpaEnvironment"
 object SpaEnvironmentFactory {
     private var spaEnvironment: SpaEnvironment? = null
 
-    var instance: SpaEnvironment
+    fun reset(env: SpaEnvironment) {
+        spaEnvironment = env
+        Log.d(TAG, "reset")
+    }
+
+    val instance: SpaEnvironment
         get() {
             if (spaEnvironment == null)
                 throw UnsupportedOperationException("Spa environment is not set")
             return spaEnvironment!!
         }
-        set(env: SpaEnvironment) {
-            if (spaEnvironment != null) {
-                Log.w(TAG, "Spa environment is already set, ignore the latter one.")
-                return
-            }
-            spaEnvironment = env
-        }
 }
 
 abstract class SpaEnvironment {