diff --git a/chrome/browser/ssl/https_upgrades_util.cc b/chrome/browser/ssl/https_upgrades_util.cc
index cb648f65110d1b9496f619a353e92d238807cffa..121ba5a83bedecf541aed00ee4954b3ca2e15014 100644
--- a/chrome/browser/ssl/https_upgrades_util.cc
+++ b/chrome/browser/ssl/https_upgrades_util.cc
@@ -74,11 +74,11 @@ ComputeInterstitialState(content::WebContents* web_contents, const GURL& url) {
   security_interstitials::https_only_mode::HttpInterstitialState
       interstitial_state;
   interstitial_state.enabled_by_pref =
-      prefs && prefs->GetBoolean(prefs::kHttpsOnlyModeEnabled);
+      prefs && prefs->GetBooleanOr(prefs::kHttpsOnlyModeEnabled, NormalWindowHttpsOnly(url, profile));
 
   if (base::FeatureList::IsEnabled(features::kHttpsFirstModeIncognito)) {
     if (profile->IsIncognitoProfile() && prefs &&
-        prefs->GetBoolean(prefs::kHttpsFirstModeIncognito)) {
+        prefs->GetBooleanOr(prefs::kHttpsFirstModeIncognito, NormalWindowHttpsOnly(url, profile))) {
       interstitial_state.enabled_by_incognito = true;
     }
   }