diff --git a/client/state/themes/actions/activate.js b/client/state/themes/actions/activate.js
index 31024d01ecc805..5ea59f8397c5ce 100644
--- a/client/state/themes/actions/activate.js
+++ b/client/state/themes/actions/activate.js
@@ -45,6 +45,8 @@ export function activate(
 			return dispatch( showAutoLoadingHomepageWarning( themeId ) );
 		}
 
+		keepCurrentHomepage = isSiteAtomic( getState(), siteId ) ? true : keepCurrentHomepage;
+
 		if ( isJetpackSite( getState(), siteId ) && ! getTheme( getState(), siteId, themeId ) ) {
 			const installId = suffixThemeIdForInstall( getState(), siteId, themeId );
 			// If theme is already installed, installation will silently fail,
@@ -54,8 +56,6 @@ export function activate(
 			);
 		}
 
-		keepCurrentHomepage = isSiteAtomic( getState(), siteId ) ? true : keepCurrentHomepage;
-
 		return dispatch( activateTheme( themeId, siteId, source, purchased, keepCurrentHomepage ) );
 	};
 }