diff --git a/CHANGELOG.JSON b/CHANGELOG.JSON
index 83721d4cd..5ab75dbf4 100644
--- a/CHANGELOG.JSON
+++ b/CHANGELOG.JSON
@@ -6,7 +6,7 @@
         "new": [],
         "enhancements": [],
         "fixes": [
-          "Documentation for `RichText`: correct event handler name [#898](https://github.com/pnp/sp-dev-fx-controls-react/pull/898)",
+          "Documentation for `RichText`: correct event handler name [#898](https://github.com/pnp/sp-dev-fx-controls-react/pull/898)"
         ]
       },
       "contributions": [
diff --git a/src/controls/sitePicker/SitePicker.tsx b/src/controls/sitePicker/SitePicker.tsx
index 588ffc505..0b70256dc 100644
--- a/src/controls/sitePicker/SitePicker.tsx
+++ b/src/controls/sitePicker/SitePicker.tsx
@@ -148,7 +148,7 @@ export const SitePicker: React.FunctionComponent<ISitePickerProps> = (props: Rea
           key: s.url,
           text: s.title,
           data: s,
-          selected: selectedSitesIds.indexOf(s.url) !== -1
+          //selected: selectedSitesIds.indexOf(s.url) !== -1
         });
       });
     }
@@ -207,7 +207,11 @@ export const SitePicker: React.FunctionComponent<ISitePickerProps> = (props: Rea
 
       return sites;
     });
-  }, [initialSites]);
+
+    if (!allSites) {
+      setIsLoading(true);
+    }
+  }, [initialSites, allSites]);
 
   React.useEffect(() => {
     if (!context || !isLoading) {