diff --git a/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
index b38359b..e2c1b58 100644
--- a/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
@@ -68,6 +68,7 @@
 
     public SatelliteSettingPreferenceController(@NonNull Context context, @NonNull String key) {
         super(context, key);
+        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
     }
 
     /**
@@ -78,7 +79,6 @@
     public void initialize(int subId) {
         logd("initialize(), subId=" + subId);
         mSubId = subId;
-        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
         mSatelliteManager = mContext.getSystemService(SatelliteManager.class);
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
         if (mTelephonyManager != null) {
diff --git a/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java b/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
index b404801..c1d838c 100644
--- a/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
@@ -64,6 +64,7 @@
 
     public SatelliteSettingsPreferenceCategoryController(Context context, String key) {
         super(context, key);
+        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
     }
 
     /**
@@ -74,7 +75,6 @@
     public void init(int subId) {
         Log.d(TAG, "init(), subId=" + subId);
         mSubId = subId;
-        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
         mSatelliteManager = mContext.getSystemService(SatelliteManager.class);
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
         requestIsSatelliteSupported();
