diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift
index ae1fa97619a5..d7ea07c3e198 100644
--- a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift	
@@ -84,8 +84,9 @@ extension SitePickerViewController: BlogDetailHeaderViewDelegate {
 
         NoticesDispatch.lock()
 
-        if !FeatureFlag.siteIconCreator.enabled {
+        guard FeatureFlag.siteIconCreator.enabled else {
             showUpdateSiteIconAlert()
+            return
         }
 
         showSiteIconSelectionAlert()