diff --git a/client/my-sites/theme/main.jsx b/client/my-sites/theme/main.jsx
index 381a2b4106a6e..1bf7c76d7efe2 100644
--- a/client/my-sites/theme/main.jsx
+++ b/client/my-sites/theme/main.jsx
@@ -39,7 +39,6 @@ import BodySectionCssClass from 'calypso/layout/body-section-css-class';
 import PageViewTracker from 'calypso/lib/analytics/page-view-tracker';
 import { decodeEntities, preventWidows } from 'calypso/lib/formatting';
 import { PerformanceTrackerStop } from 'calypso/lib/performance-tracking';
-import AutoLoadingHomepageModal from 'calypso/my-sites/themes/auto-loading-homepage-modal';
 import { localizeThemesPath } from 'calypso/my-sites/themes/helpers';
 import ThanksModal from 'calypso/my-sites/themes/thanks-modal';
 import { connectOptions } from 'calypso/my-sites/themes/theme-options';
@@ -1212,7 +1211,6 @@ class ThemeSheet extends Component {
 				{ ! isNewDetailsAndPreview && this.renderBar() }
 				<QueryActiveTheme siteId={ siteId } />
 				<ThanksModal source="details" themeId={ this.props.themeId } />
-				<AutoLoadingHomepageModal source="details" />
 				{ ! isNewDetailsAndPreview && pageUpsellBanner }
 				{ ! isNewDetailsAndPreview && (
 					<HeaderCake
diff --git a/client/my-sites/themes/auto-loading-homepage-modal.jsx b/client/my-sites/themes/auto-loading-homepage-modal.jsx
deleted file mode 100644
index 2788e116dad81..0000000000000
--- a/client/my-sites/themes/auto-loading-homepage-modal.jsx
+++ /dev/null
@@ -1,314 +0,0 @@
-import { recordTracksEvent } from '@automattic/calypso-analytics';
-import { Dialog, Gridicon, Spinner } from '@automattic/components';
-import { localizeUrl } from '@automattic/i18n-utils';
-import { isWithinBreakpoint, subscribeIsWithinBreakpoint } from '@automattic/viewport';
-import { translate } from 'i18n-calypso';
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-import { connect } from 'react-redux';
-import ExternalLink from 'calypso/components/external-link';
-import FormLabel from 'calypso/components/forms/form-label';
-import FormRadio from 'calypso/components/forms/form-radio';
-import TrackComponentView from 'calypso/lib/analytics/track-component-view';
-import { preventWidows } from 'calypso/lib/formatting';
-import { getSiteDomain } from 'calypso/state/sites/selectors';
-import {
-	acceptAutoLoadingHomepageWarning,
-	hideAutoLoadingHomepageWarning,
-	activate as activateTheme,
-} from 'calypso/state/themes/actions';
-import {
-	getCanonicalTheme,
-	hasActivatedTheme,
-	themeHasAutoLoadingHomepage,
-	isActivatingTheme,
-	isThemeActive,
-	shouldShowHomepageWarning,
-	getPreActivateThemeId,
-} from 'calypso/state/themes/selectors';
-import { getSelectedSiteId } from 'calypso/state/ui/selectors';
-
-import './auto-loading-homepage-modal.scss';
-
-class AutoLoadingHomepageModal extends Component {
-	static propTypes = {
-		source: PropTypes.oneOf( [ 'details', 'list', 'upload' ] ).isRequired,
-		theme: PropTypes.shape( {
-			author: PropTypes.string,
-			author_uri: PropTypes.string,
-			id: PropTypes.string,
-			name: PropTypes.string,
-		} ),
-		hasActivated: PropTypes.bool.isRequired,
-		isActivating: PropTypes.bool.isRequired,
-		hasAutoLoadingHomepage: PropTypes.bool,
-		siteId: PropTypes.number,
-		isVisible: PropTypes.bool,
-		onClose: PropTypes.func,
-		installingThemeId: PropTypes.string,
-	};
-
-	constructor( props ) {
-		super( props );
-		this.state = {
-			homepageAction: 'keep_current_homepage',
-			// Used to reset state when dialog re-opens, see `getDerivedStateFromProps`
-			wasVisible: props.isVisible,
-			// Don't render the iframe on mobile; Doing it here prevents unnecessary data fetching vs. CSS.
-			isNarrow: isWithinBreakpoint( '<782px' ),
-		};
-	}
-
-	componentDidMount() {
-		// Change the isNarrow state when the size of the browser changes.
-		// (Putting this on an attribute instead of state because of react/no-did-mount-set-state)
-		this.unsubscribe = subscribeIsWithinBreakpoint( '<782px', ( isNarrow ) =>
-			this.setState( { isNarrow } )
-		);
-	}
-
-	componentWillUnmount() {
-		if ( typeof this.unsubscribe === 'function' ) {
-			this.unsubscribe();
-		}
-	}
-
-	static getDerivedStateFromProps( nextProps, prevState ) {
-		// This component doesn't unmount when the dialog closes, so the state
-		// needs to be reset back to defaults each time it opens.
-		// Reseting `homepageAction` ensures the default option will be selected.
-		if ( nextProps.isVisible && ! prevState.wasVisible ) {
-			return { homepageAction: 'keep_current_homepage', wasVisible: true };
-		} else if ( ! nextProps.isVisible && prevState.wasVisible ) {
-			return { wasVisible: false };
-		}
-		return null;
-	}
-
-	handleHomepageAction = ( event ) => {
-		this.setState( { homepageAction: event.currentTarget.value } );
-	};
-
-	closeModalHandler =
-		( action = 'dismiss' ) =>
-		() => {
-			const { installingThemeId, siteId, source } = this.props;
-			if ( 'activeTheme' === action ) {
-				this.props.acceptAutoLoadingHomepageWarning( installingThemeId );
-				const keepCurrentHomepage = this.state.homepageAction === 'keep_current_homepage';
-				recordTracksEvent( 'calypso_theme_autoloading_homepage_modal_activate_click', {
-					theme: installingThemeId,
-					keep_current_homepage: keepCurrentHomepage,
-				} );
-				return this.props.activateTheme(
-					installingThemeId,
-					siteId,
-					source,
-					false,
-					keepCurrentHomepage
-				);
-			} else if ( 'keepCurrentTheme' === action ) {
-				recordTracksEvent( 'calypso_theme_autoloading_homepage_modal_dismiss', {
-					action: 'button',
-					theme: installingThemeId,
-				} );
-				return this.props.hideAutoLoadingHomepageWarning();
-			} else if ( 'dismiss' === action ) {
-				recordTracksEvent( 'calypso_theme_autoloading_homepage_modal_dismiss', {
-					action: 'escape',
-					theme: installingThemeId,
-				} );
-				return this.props.hideAutoLoadingHomepageWarning();
-			}
-		};
-
-	render() {
-		const {
-			theme,
-			hasActivated,
-			isActivating,
-			hasAutoLoadingHomepage,
-			isCurrentTheme,
-			isVisible = false,
-		} = this.props;
-		const { isNarrow } = this.state;
-
-		// Nothing to do when it's the current theme.
-		if ( isCurrentTheme ) {
-			return null;
-		}
-
-		// Nothing to show if the theme doesn't have auto loading homepage.
-		if ( ! hasAutoLoadingHomepage ) {
-			return null;
-		}
-
-		// Hide while is activating or when it's activated.
-		if ( isActivating || hasActivated ) {
-			return null;
-		}
-
-		if ( ! theme ) {
-			return null;
-		}
-
-		const {
-			name: themeName,
-			id: themeId,
-			stylesheet,
-			screenshot: themeScreenshot,
-		} = this.props.theme;
-
-		const iframeSrcKeepHomepage = `//${ this.props.siteDomain }?theme=${ encodeURIComponent(
-			stylesheet
-		) }&hide_banners=true&preview_overlay=true`;
-
-		return (
-			<Dialog
-				className="themes__auto-loading-homepage-modal"
-				isVisible={ isVisible }
-				buttons={ [
-					{
-						action: 'keepCurrentTheme',
-						label: translate( 'Keep my current theme' ),
-						isPrimary: false,
-						onClick: this.closeModalHandler( 'keepCurrentTheme' ),
-					},
-					{
-						action: 'activeTheme',
-						label: translate( 'Activate %(themeName)s', { args: { themeName } } ),
-						isPrimary: true,
-						onClick: this.closeModalHandler( 'activeTheme' ),
-					},
-				] }
-				onClose={ this.closeModalHandler( 'dismiss' ) }
-			>
-				<Gridicon
-					icon="cross"
-					className="themes__auto-loading-homepage-modal-close-icon"
-					onClick={ this.closeModalHandler( 'dismiss' ) }
-				/>
-				<TrackComponentView
-					eventName="calypso_theme_autoloading_homepage_modal_view"
-					eventProperties={ { theme: themeId } }
-				/>
-				<div className="themes__theme-preview-wrapper">
-					<h1>
-						{ translate( 'How would you like to use %(themeName)s?', {
-							args: { themeName },
-						} ) }
-					</h1>
-					<div className="themes__theme-preview-items">
-						<div className="themes__theme-preview-item themes__theme-preview-item-iframe-container">
-							<FormLabel>
-								<div className="themes__iframe-wrapper">
-									<Spinner />
-									{ ! isNarrow && (
-										<iframe
-											scrolling="no"
-											loading="lazy"
-											title={ translate( 'Preview of current homepage with new theme applied' ) }
-											src={ iframeSrcKeepHomepage }
-										/>
-									) }
-								</div>
-								<FormRadio
-									value="keep_current_homepage"
-									checked={ 'keep_current_homepage' === this.state.homepageAction }
-									onChange={ this.handleHomepageAction }
-									label={ preventWidows(
-										translate( 'Switch theme, preserving my homepage content.' )
-									) }
-								/>
-							</FormLabel>
-						</div>
-						<div className="themes__theme-preview-item">
-							<FormLabel>
-								<div className="themes__theme-preview-image-wrapper">
-									<img
-										src={ themeScreenshot }
-										alt={ translate( "Preview of new theme's default homepage" ) }
-									/>
-								</div>
-								<FormRadio
-									value="use_new_homepage"
-									checked={ 'use_new_homepage' === this.state.homepageAction }
-									onChange={ this.handleHomepageAction }
-									label={ preventWidows(
-										translate( 'Replace my homepage content with the %(themeName)s homepage.', {
-											args: { themeName },
-										} )
-									) }
-								/>
-							</FormLabel>
-						</div>
-					</div>
-					<div className="themes__autoloading-homepage-option-description">
-						{ this.state.homepageAction === 'keep_current_homepage' && (
-							<p>
-								{ preventWidows(
-									translate(
-										'Your new theme design will be applied without changing your homepage content.'
-									)
-								) }{ ' ' }
-								<ExternalLink
-									href={ localizeUrl( 'https://wordpress.com/support/changing-themes/' ) }
-									icon
-									target="__blank"
-								>
-									{ translate( 'Learn more.' ) }
-								</ExternalLink>
-							</p>
-						) }
-						{ this.state.homepageAction === 'use_new_homepage' && (
-							<p>
-								<span
-									// eslint-disable-next-line react/no-danger
-									dangerouslySetInnerHTML={ {
-										__html: preventWidows(
-											translate(
-												'After activation, you can still access your old homepage content under Pages &rarr; Drafts.'
-											)
-										),
-									} }
-								/>{ ' ' }
-								<ExternalLink
-									href={ localizeUrl( 'https://wordpress.com/support/changing-themes/' ) }
-									icon
-									target="__blank"
-								>
-									{ translate( 'Learn more.' ) }
-								</ExternalLink>
-							</p>
-						) }
-					</div>
-				</div>
-			</Dialog>
-		);
-	}
-}
-
-export default connect(
-	( state ) => {
-		const siteId = getSelectedSiteId( state );
-		const installingThemeId = getPreActivateThemeId( state );
-
-		return {
-			siteId,
-			siteDomain: getSiteDomain( state, siteId ),
-			installingThemeId,
-			theme: installingThemeId && getCanonicalTheme( state, siteId, installingThemeId ),
-			isActivating: !! isActivatingTheme( state, siteId ),
-			hasActivated: !! hasActivatedTheme( state, siteId ),
-			hasAutoLoadingHomepage: themeHasAutoLoadingHomepage( state, installingThemeId, siteId ),
-			isCurrentTheme: isThemeActive( state, installingThemeId, siteId ),
-			isVisible: shouldShowHomepageWarning( state, installingThemeId ),
-		};
-	},
-	{
-		acceptAutoLoadingHomepageWarning,
-		hideAutoLoadingHomepageWarning,
-		activateTheme,
-		recordTracksEvent,
-	}
-)( AutoLoadingHomepageModal );
diff --git a/client/my-sites/themes/auto-loading-homepage-modal.scss b/client/my-sites/themes/auto-loading-homepage-modal.scss
deleted file mode 100644
index ab3d2164220ce..0000000000000
--- a/client/my-sites/themes/auto-loading-homepage-modal.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-@import "@wordpress/base-styles/breakpoints";
-@import "@wordpress/base-styles/mixins";
-
-.themes__auto-loading-homepage-modal {
-	position: relative;
-
-	h1 {
-		margin-bottom: 1em;
-		text-align: center;
-	}
-}
-
-.themes__auto-loading-homepage-modal-close-icon {
-	cursor: pointer;
-	width: 16px;
-	height: 16px;
-	position: absolute;
-	top: 10px;
-	right: 10px;
-
-	@include break-medium {
-		width: 24px;
-		height: 24px;
-		right: 20px;
-		top: 20px;
-	}
-}
-
-.themes__auto-loading-homepage-modal-homepage-hint {
-	margin-left: 1.5em;
-	font-size: $font-body-small;
-	font-style: italic;
-	margin-top: -5px;
-}
-
-.themes__theme-preview-wrapper {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	max-width: 700px;
-}
-
-.themes__autoloading-homepage-option-description {
-	font-size: $font-body-small;
-	min-height: 90px;
-
-	@include break-medium {
-		width: 70%;
-		min-height: 0;
-	}
-}
-
-.themes__theme-preview-items {
-	display: flex;
-	flex-direction: column;
-	margin: 0 0 1em;
-	max-width: 700px;
-
-	@include break-medium {
-		flex-direction: row;
-	}
-}
-
-.themes__theme-preview-item {
-	img,
-	.themes__iframe-wrapper {
-		display: none;
-	}
-
-	@include break-medium {
-		border: 1px solid var(--color-border-subtle);
-		border-radius: 2px;
-		width: 48%;
-		margin-left: 2%;
-
-		img,
-		.themes__iframe-wrapper,
-		.themes__theme-preview-image-wrapper {
-			display: block;
-			height: 100%;
-		}
-
-		.themes__iframe-wrapper,
-		.themes__theme-preview-image-wrapper {
-			max-height: 235px;
-			overflow: hidden;
-		}
-
-		.form-label {
-			height: 100%;
-		}
-
-		.form-radio {
-			margin: 1em;
-		}
-
-		.form-radio__label {
-			margin: 1em 1em 1em 3em;
-		}
-
-		&:first-of-type {
-			margin-left: 0;
-			margin-right: 2%;
-		}
-	}
-
-	img {
-		width: 100%;
-		height: auto;
-	}
-}
-
-.themes__theme-preview-item-iframe-container {
-	display: flex;
-	flex-direction: column;
-
-	.themes__iframe-wrapper {
-		flex-grow: 1;
-		overflow: hidden;
-		position: relative;
-		pointer-events: none;
-	}
-	iframe {
-		height: 357%;
-		width: 357%;
-		max-width: 357%;
-		transform: scale(0.28);
-		transform-origin: top left;
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
-}
-
-.themes__iframe-wrapper .spinner {
-	position: relative;
-	top: 50%;
-}
diff --git a/client/my-sites/themes/thanks-modal.jsx b/client/my-sites/themes/thanks-modal.jsx
index 5765f38571df9..4ff472f94b75b 100644
--- a/client/my-sites/themes/thanks-modal.jsx
+++ b/client/my-sites/themes/thanks-modal.jsx
@@ -4,13 +4,10 @@ import PropTypes from 'prop-types';
 import { Component } from 'react';
 import { connect } from 'react-redux';
 import PulsingDot from 'calypso/components/pulsing-dot';
-import { addQueryArgs } from 'calypso/lib/route';
 import getCustomizeOrEditFrontPageUrl from 'calypso/state/selectors/get-customize-or-edit-front-page-url';
 import getSiteUrl from 'calypso/state/selectors/get-site-url';
-import isSiteAtomic from 'calypso/state/selectors/is-site-wpcom-atomic';
 import shouldCustomizeHomepageWithGutenberg from 'calypso/state/selectors/should-customize-homepage-with-gutenberg';
 import { requestSite } from 'calypso/state/sites/actions';
-import { isJetpackSite } from 'calypso/state/sites/selectors';
 import getSiteSlug from 'calypso/state/sites/selectors/get-site-slug';
 import { clearActivated } from 'calypso/state/themes/actions';
 import {
@@ -24,7 +21,6 @@ import {
 	isInstallingTheme,
 	isWpcomTheme,
 } from 'calypso/state/themes/selectors';
-import { themeHasAutoLoadingHomepage } from 'calypso/state/themes/selectors/theme-has-auto-loading-homepage';
 import { getSelectedSiteId } from 'calypso/state/ui/selectors';
 import { trackClick } from './helpers';
 import { isFullSiteEditingTheme } from './is-full-site-editing-theme';
@@ -334,19 +330,6 @@ const ConnectedThanksModal = connect(
 		// Note: Gutenberg buttons will only show if the homepage is a page.
 		const shouldEditHomepageWithGutenberg = shouldCustomizeHomepageWithGutenberg( state, siteId );
 
-		const isAtomic = isSiteAtomic( state, siteId );
-		const isJetpack = isJetpackSite( state, siteId );
-		const hasAutoLoadingHomepage = themeHasAutoLoadingHomepage( state, currentThemeId, siteId );
-
-		// Atomic & Jetpack do not have auto-loading-homepage behavior, so we trigger the layout picker for them.
-		const customizeUrl =
-			( isAtomic || isJetpack ) && hasAutoLoadingHomepage
-				? addQueryArgs(
-						{ 'new-homepage': true },
-						getCustomizeOrEditFrontPageUrl( state, currentThemeId, siteId, isFSEActive )
-				  )
-				: getCustomizeOrEditFrontPageUrl( state, currentThemeId, siteId, isFSEActive );
-
 		return {
 			siteId,
 			siteUrl,
@@ -359,7 +342,7 @@ const ConnectedThanksModal = connect(
 			),
 			shouldEditHomepageWithGutenberg,
 			detailsUrl: getThemeDetailsUrl( state, currentThemeId, siteId ),
-			customizeUrl,
+			customizeUrl: getCustomizeOrEditFrontPageUrl( state, currentThemeId, siteId, isFSEActive ),
 			forumUrl: getThemeForumUrl( state, currentThemeId, siteId ),
 			isActivating: !! isActivatingTheme( state, siteId ),
 			isInstalling: isInstallingTheme( state, currentThemeId, siteId ),
diff --git a/client/my-sites/themes/theme-showcase.jsx b/client/my-sites/themes/theme-showcase.jsx
index 1afefdf74a070..744b853c33525 100644
--- a/client/my-sites/themes/theme-showcase.jsx
+++ b/client/my-sites/themes/theme-showcase.jsx
@@ -19,7 +19,6 @@ import SearchThemes from 'calypso/components/search-themes';
 import SimplifiedSegmentedControl from 'calypso/components/segmented-control/simplified';
 import PageViewTracker from 'calypso/lib/analytics/page-view-tracker';
 import { buildRelativeSearchUrl } from 'calypso/lib/build-url';
-import AutoLoadingHomepageModal from 'calypso/my-sites/themes/auto-loading-homepage-modal';
 import ThanksModal from 'calypso/my-sites/themes/thanks-modal';
 import { isUserLoggedIn } from 'calypso/state/current-user/selectors';
 import getSiteFeaturesById from 'calypso/state/selectors/get-site-features';
@@ -538,7 +537,6 @@ class ThemeShowcase extends Component {
 					{ siteId && <QuerySitePurchases siteId={ siteId } /> }
 					<QueryProductsList />
 					<ThanksModal source="list" />
-					<AutoLoadingHomepageModal source="list" />
 					<ThemePreview />
 				</div>
 			</div>
diff --git a/client/my-sites/themes/theme-upload/index.jsx b/client/my-sites/themes/theme-upload/index.jsx
index 7aabb623b6ef2..83a92206c5af8 100644
--- a/client/my-sites/themes/theme-upload/index.jsx
+++ b/client/my-sites/themes/theme-upload/index.jsx
@@ -28,7 +28,6 @@ import Main from 'calypso/components/main';
 import WpAdminAutoLogin from 'calypso/components/wpadmin-auto-login';
 import PageViewTracker from 'calypso/lib/analytics/page-view-tracker';
 import { isEligibleForProPlan } from 'calypso/my-sites/plans-comparison';
-import AutoLoadingHomepageModal from 'calypso/my-sites/themes/auto-loading-homepage-modal';
 import ThanksModal from 'calypso/my-sites/themes/thanks-modal';
 // Necessary for ThanksModal
 import { connectOptions } from 'calypso/my-sites/themes/theme-options';
@@ -327,7 +326,6 @@ class Upload extends Component {
 				<QueryActiveTheme siteId={ siteId } />
 				{ themeId && complete && <QueryCanonicalTheme siteId={ siteId } themeId={ themeId } /> }
 				<ThanksModal source="upload" />
-				<AutoLoadingHomepageModal source="upload" />
 
 				<ThemesHeader
 					description={ translate(
diff --git a/client/state/themes/action-types.js b/client/state/themes/action-types.js
index ab3f6c3a81f4f..6afdc8a3b7c2a 100644
--- a/client/state/themes/action-types.js
+++ b/client/state/themes/action-types.js
@@ -33,7 +33,6 @@ export const THEME_PREVIEW_STATE = 'THEME_PREVIEW_STATE';
 export const THEME_REQUEST = 'THEME_REQUEST';
 export const THEME_REQUEST_FAILURE = 'THEME_REQUEST_FAILURE';
 export const THEME_REQUEST_SUCCESS = 'THEME_REQUEST_SUCCESS';
-export const THEME_SHOW_AUTO_LOADING_HOMEPAGE_WARNING = 'THEME_SHOW_AUTO_LOADING_HOMEPAGE_WARNING';
 export const THEME_START_ACTIVATION_SYNC = 'THEME_START_ACTIVATION_SYNC';
 export const THEME_STOP_ACTIVATION_SYNC = 'THEME_STOP_ACTIVATION_SYNC';
 export const THEME_TRANSFER_INITIATE_FAILURE = 'THEME_TRANSFER_INITIATE_FAILURE';
diff --git a/client/state/themes/actions/accept-auto-loading-homepage-warning.js b/client/state/themes/actions/accept-auto-loading-homepage-warning.js
deleted file mode 100644
index 8a90bdcf4f91c..0000000000000
--- a/client/state/themes/actions/accept-auto-loading-homepage-warning.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { THEME_ACCEPT_AUTO_LOADING_HOMEPAGE_WARNING } from 'calypso/state/themes/action-types';
-
-import 'calypso/state/themes/init';
-
-export function acceptAutoLoadingHomepageWarning( themeId ) {
-	return {
-		type: THEME_ACCEPT_AUTO_LOADING_HOMEPAGE_WARNING,
-		themeId,
-	};
-}
diff --git a/client/state/themes/actions/activate.js b/client/state/themes/actions/activate.js
index 1a54ca8a648d5..31014f9164642 100644
--- a/client/state/themes/actions/activate.js
+++ b/client/state/themes/actions/activate.js
@@ -1,15 +1,8 @@
-import { isEnabled } from '@automattic/calypso-config';
-import isSiteAtomic from 'calypso/state/selectors/is-site-wpcom-atomic';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import { activateTheme } from 'calypso/state/themes/actions/activate-theme';
 import { installAndActivateTheme } from 'calypso/state/themes/actions/install-and-activate-theme';
-import { showAutoLoadingHomepageWarning } from 'calypso/state/themes/actions/show-auto-loading-homepage-warning';
 import { suffixThemeIdForInstall } from 'calypso/state/themes/actions/suffix-theme-id-for-install';
-import {
-	getTheme,
-	hasAutoLoadingHomepageModalAccepted,
-	themeHasAutoLoadingHomepage,
-} from 'calypso/state/themes/selectors';
+import { getTheme } from 'calypso/state/themes/selectors';
 
 import 'calypso/state/themes/init';
 
@@ -29,33 +22,9 @@ export function activate(
 	siteId,
 	source = 'unknown',
 	purchased = false,
-	keepCurrentHomepage = false
+	keepCurrentHomepage = true
 ) {
 	return ( dispatch, getState ) => {
-		let showModalCondition =
-			! isJetpackSite( getState(), siteId ) && ! isSiteAtomic( getState(), siteId );
-
-		if ( isEnabled( 'themes/atomic-homepage-replace' ) ) {
-			showModalCondition =
-				! isJetpackSite( getState(), siteId ) || isSiteAtomic( getState(), siteId );
-		} else {
-			// Keep default behaviour on Atomic. See https://github.com/Automattic/wp-calypso/pull/65846#issuecomment-1192650587
-			keepCurrentHomepage = isSiteAtomic( getState(), siteId ) ? true : keepCurrentHomepage;
-		}
-
-		/**
-		 * Let's check if the theme will change the homepage of the site,
-		 * before to definitely start the theme-activating process,
-		 * allowing cancel it if it's desired.
-		 */
-		if (
-			themeHasAutoLoadingHomepage( getState(), themeId, siteId ) &&
-			showModalCondition &&
-			! hasAutoLoadingHomepageModalAccepted( getState(), themeId )
-		) {
-			return dispatch( showAutoLoadingHomepageWarning( themeId ) );
-		}
-
 		if ( isJetpackSite( getState(), siteId ) && ! getTheme( getState(), siteId, themeId ) ) {
 			const installId = suffixThemeIdForInstall( getState(), siteId, themeId );
 			// If theme is already installed, installation will silently fail,
diff --git a/client/state/themes/actions/hide-auto-loading-homepage-warning.js b/client/state/themes/actions/hide-auto-loading-homepage-warning.js
deleted file mode 100644
index 67f9831b7a61a..0000000000000
--- a/client/state/themes/actions/hide-auto-loading-homepage-warning.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { THEME_HIDE_AUTO_LOADING_HOMEPAGE_WARNING } from 'calypso/state/themes/action-types';
-
-import 'calypso/state/themes/init';
-
-export function hideAutoLoadingHomepageWarning() {
-	return {
-		type: THEME_HIDE_AUTO_LOADING_HOMEPAGE_WARNING,
-	};
-}
diff --git a/client/state/themes/actions/index.js b/client/state/themes/actions/index.js
index b1f2a42986475..812e5d2d6df25 100644
--- a/client/state/themes/actions/index.js
+++ b/client/state/themes/actions/index.js
@@ -1,4 +1,3 @@
-export { acceptAutoLoadingHomepageWarning } from 'calypso/state/themes/actions/accept-auto-loading-homepage-warning';
 export { activate } from 'calypso/state/themes/actions/activate';
 export { activateTheme } from 'calypso/state/themes/actions/activate-theme';
 export { addExternalManagedThemeToCart } from 'calypso/state/themes/actions/add-external-managed-theme-to-cart';
@@ -6,7 +5,6 @@ export { clearActivated } from 'calypso/state/themes/actions/clear-activated';
 export { clearThemeUpload } from 'calypso/state/themes/actions/clear-theme-upload';
 export { confirmDelete } from 'calypso/state/themes/actions/confirm-delete';
 export { deleteTheme } from 'calypso/state/themes/actions/delete-theme';
-export { hideAutoLoadingHomepageWarning } from 'calypso/state/themes/actions/hide-auto-loading-homepage-warning';
 export { hideThemePreview } from 'calypso/state/themes/actions/hide-theme-preview';
 export { installAndActivateTheme } from 'calypso/state/themes/actions/install-and-activate-theme';
 export { installAndTryAndCustomizeTheme } from 'calypso/state/themes/actions/install-and-try-and-customize-theme';
@@ -29,7 +27,6 @@ export { requestThemeFilters } from 'calypso/state/themes/actions/request-theme-
 export { requestThemes } from 'calypso/state/themes/actions/request-themes';
 export { setBackPath } from 'calypso/state/themes/actions/set-back-path';
 export { setThemePreviewOptions } from 'calypso/state/themes/actions/set-theme-preview-options';
-export { showAutoLoadingHomepageWarning } from 'calypso/state/themes/actions/show-auto-loading-homepage-warning';
 export { showThemePreview } from 'calypso/state/themes/actions/show-theme-preview';
 export { themeActivated } from 'calypso/state/themes/actions/theme-activated';
 export { themeStartActivationSync } from 'calypso/state/themes/actions/theme-start-activation-sync';
diff --git a/client/state/themes/actions/show-auto-loading-homepage-warning.js b/client/state/themes/actions/show-auto-loading-homepage-warning.js
deleted file mode 100644
index aad0d71ff8977..0000000000000
--- a/client/state/themes/actions/show-auto-loading-homepage-warning.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { THEME_SHOW_AUTO_LOADING_HOMEPAGE_WARNING } from 'calypso/state/themes/action-types';
-
-import 'calypso/state/themes/init';
-
-export function showAutoLoadingHomepageWarning( themeId ) {
-	return {
-		type: THEME_SHOW_AUTO_LOADING_HOMEPAGE_WARNING,
-		themeId,
-	};
-}
diff --git a/client/state/themes/reducer.js b/client/state/themes/reducer.js
index f5ff4d8e914d0..d82a0522e7166 100644
--- a/client/state/themes/reducer.js
+++ b/client/state/themes/reducer.js
@@ -34,9 +34,6 @@ import {
 	THEMES_REQUEST_FAILURE,
 	THEME_PREVIEW_OPTIONS,
 	THEME_PREVIEW_STATE,
-	THEME_SHOW_AUTO_LOADING_HOMEPAGE_WARNING,
-	THEME_HIDE_AUTO_LOADING_HOMEPAGE_WARNING,
-	THEME_ACCEPT_AUTO_LOADING_HOMEPAGE_WARNING,
 	UPSELL_CARD_DISPLAYED,
 	THEMES_LOADING_CART,
 	THEME_START_ACTIVATION_SYNC,
@@ -446,35 +443,6 @@ export const themePreviewVisibility = ( state = null, action ) => {
 	return state;
 };
 
-export const themeHasAutoLoadingHomepageWarning = ( state = null, action ) => {
-	switch ( action.type ) {
-		case THEME_SHOW_AUTO_LOADING_HOMEPAGE_WARNING: {
-			return {
-				themeId: action.themeId,
-				show: true,
-				accepted: false,
-			};
-		}
-
-		case THEME_ACCEPT_AUTO_LOADING_HOMEPAGE_WARNING: {
-			return {
-				themeId: action.themeId,
-				show: false,
-				accepted: true,
-			};
-		}
-
-		case THEME_ACTIVATE:
-		case THEME_ACTIVATE_SUCCESS:
-		case THEME_ACTIVATE_FAILURE:
-		case THEME_HIDE_AUTO_LOADING_HOMEPAGE_WARNING: {
-			return null;
-		}
-	}
-
-	return state;
-};
-
 export const themeFilters = withSchemaValidation( themeFiltersSchema, ( state = {}, action ) => {
 	switch ( action.type ) {
 		case THEME_FILTERS_ADD: {
@@ -662,7 +630,6 @@ const combinedReducer = combineReducers( {
 	themeFilterRequestError,
 	recommendedThemes,
 	trendingThemes,
-	themeHasAutoLoadingHomepageWarning,
 	themesUpdate,
 	upsellCardDisplayed,
 	isLoadingCart,
diff --git a/client/state/themes/selectors/get-pre-activate-theme-id.js b/client/state/themes/selectors/get-pre-activate-theme-id.js
deleted file mode 100644
index 631eb784f46d9..0000000000000
--- a/client/state/themes/selectors/get-pre-activate-theme-id.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'calypso/state/themes/init';
-
-/**
- * Return the theme ID of the theme BEFORE to activated it.
- * It allows getting the possibility to take action when it's needed.
- * Specifically, it helps to show a modal when the theme to activate
- * will change the homepage of the site, usually,
- * this feature is included in First-Template Themes.
- *
- * @param {Object} state   Global state tree
- * @returns {string} Theme ID,
- */
-export function getPreActivateThemeId( state ) {
-	return state.themes.themeHasAutoLoadingHomepageWarning?.themeId;
-}
diff --git a/client/state/themes/selectors/has-auto-loading-homepage-modal-accepted.js b/client/state/themes/selectors/has-auto-loading-homepage-modal-accepted.js
deleted file mode 100644
index ee59d80ab3590..0000000000000
--- a/client/state/themes/selectors/has-auto-loading-homepage-modal-accepted.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'calypso/state/themes/init';
-
-/**
- * Returns whether the auto loading homepage modal has been
- * accepted by the user, which means that the theme
- * will be activated.
- *
- * @param {Object} state   Global state tree
- * @param {string} themeId Theme ID to activate in the site.
- * @returns {boolean}      True if the auto loading homepage dialog has been accepted. Otherwise, False.
- */
-export function hasAutoLoadingHomepageModalAccepted( state, themeId ) {
-	return (
-		state.themes.themeHasAutoLoadingHomepageWarning?.themeId === themeId &&
-		state.themes.themeHasAutoLoadingHomepageWarning?.accepted
-	);
-}
diff --git a/client/state/themes/selectors/index.js b/client/state/themes/selectors/index.js
index dd4450044ffea..97566e87fe797 100644
--- a/client/state/themes/selectors/index.js
+++ b/client/state/themes/selectors/index.js
@@ -9,7 +9,6 @@ export { getCanonicalTheme } from 'calypso/state/themes/selectors/get-canonical-
 export { getJetpackUpgradeUrlIfPremiumTheme } from 'calypso/state/themes/selectors/get-jetpack-upgrade-url-if-premium-theme';
 export { getLastThemeQuery } from 'calypso/state/themes/selectors/get-last-theme-query';
 export { getMarketplaceThemeSubscriptionPrices } from 'calypso/state/themes/selectors/get-marketplace-theme-subscription-prices';
-export { getPreActivateThemeId } from 'calypso/state/themes/selectors/get-pre-activate-theme-id';
 export { getPremiumThemePrice } from 'calypso/state/themes/selectors/get-premium-theme-price';
 export { getPurchasedThemes } from 'calypso/state/themes/selectors/get-purchased-themes';
 export { getRecommendedThemes } from 'calypso/state/themes/selectors/get-recommended-themes';
@@ -41,7 +40,6 @@ export { getThemeSupportUrl } from 'calypso/state/themes/selectors/get-theme-sup
 export { getIsLoadingCart } from 'calypso/state/themes/selectors/get-is-loading-cart';
 export { getWpcomParentThemeId } from 'calypso/state/themes/selectors/get-wpcom-parent-theme-id';
 export { hasActivatedTheme } from 'calypso/state/themes/selectors/has-activated-theme';
-export { hasAutoLoadingHomepageModalAccepted } from 'calypso/state/themes/selectors/has-auto-loading-homepage-modal-accepted';
 export { isActivatingTheme } from 'calypso/state/themes/selectors/is-activating-theme';
 export { isAmbiguousThemeFilterTerm } from 'calypso/state/themes/selectors/is-ambiguous-theme-filter-term';
 export { isDownloadableFromWpcom } from 'calypso/state/themes/selectors/is-downloadable-from-wpcom';
@@ -69,7 +67,6 @@ export { isWpcomTheme } from 'calypso/state/themes/selectors/is-wpcom-theme';
 export { isWporgTheme } from 'calypso/state/themes/selectors/is-wporg-theme';
 export { prependThemeFilterKeys } from 'calypso/state/themes/selectors/prepend-theme-filter-keys';
 export { shouldShowTryAndCustomize } from 'calypso/state/themes/selectors/should-show-try-and-customize';
-export { shouldShowHomepageWarning } from 'calypso/state/themes/selectors/should-show-homepage-warning';
 export { themeHasAutoLoadingHomepage } from 'calypso/state/themes/selectors/theme-has-auto-loading-homepage';
 export { themePreviewVisibility } from 'calypso/state/themes/selectors/theme-preview-visibility';
 export { getThemeFiltersRequestError } from 'calypso/state/themes/selectors/get-theme-filters-request-error';
diff --git a/client/state/themes/selectors/should-show-homepage-warning.js b/client/state/themes/selectors/should-show-homepage-warning.js
deleted file mode 100644
index ba408e5c8fda3..0000000000000
--- a/client/state/themes/selectors/should-show-homepage-warning.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'calypso/state/themes/init';
-
-/**
- * Returns whether the auto loading homepage modal should be shown
- * before to start to install theme.
- *
- * @param {Object} state   Global state tree
- * @param {string} themeId Theme ID used to show the warning message before to activate.
- * @returns {boolean}      True it should show the auto loading modal. Otherwise, False.
- */
-export function shouldShowHomepageWarning( state, themeId ) {
-	return (
-		state.themes.themeHasAutoLoadingHomepageWarning?.themeId === themeId &&
-		state.themes.themeHasAutoLoadingHomepageWarning?.show
-	);
-}
diff --git a/packages/calypso-e2e/src/lib/pages/themes-detail-page.ts b/packages/calypso-e2e/src/lib/pages/themes-detail-page.ts
index f4f2a56531f3d..eaea6283fe224 100644
--- a/packages/calypso-e2e/src/lib/pages/themes-detail-page.ts
+++ b/packages/calypso-e2e/src/lib/pages/themes-detail-page.ts
@@ -9,10 +9,6 @@ const selectors = {
 	activateDesignButton: 'button:text("Activate this design")',
 	customizeDesignButton: 'span:text("Customize site")',
 
-	// Activate modal
-	activateModal: '.themes__auto-loading-homepage-modal',
-	activateModalButton: '.dialog__action-buttons button:has-text("Activate")',
-
 	// Thanks modal
 	thanksMessage: ':text("Thanks for choosing")',
 };
@@ -54,7 +50,6 @@ export class ThemesDetailPage {
 	 */
 	async activate( { keepModal = false }: { keepModal?: boolean } = {} ): Promise< void > {
 		await this.page.click( selectors.activateDesignButton );
-		await this.page.click( selectors.activateModalButton );
 		await this.page.waitForSelector( selectors.thanksMessage );
 		if ( ! keepModal ) {
 			await this.page.keyboard.press( 'Escape' );