diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingThemePickerViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingThemePickerViewHolder.kt
index 1ba3365c5..2493b0204 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingThemePickerViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingThemePickerViewHolder.kt
@@ -74,9 +74,9 @@ class OnboardingThemePickerViewHolder(private val view: View) : RecyclerView.Vie
 
         with(Settings.getInstance(view.context)) {
             when {
-                this.shouldFollowDeviceTheme -> radioFollowDeviceTheme.isChecked = true
                 this.shouldUseLightTheme -> radioLightTheme.isChecked = true
-                else -> radioDarkTheme.isChecked = true
+                this.shouldUseDarkTheme -> radioDarkTheme.isChecked = true
+                else -> radioFollowDeviceTheme.isChecked = true
             }
         }
     }