diff --git a/src/popup.tsx b/src/popup.tsx
index fefead63d..ce274b5af 100644
--- a/src/popup.tsx
+++ b/src/popup.tsx
@@ -129,14 +129,15 @@ export default function Popup() {
             </Route>
           </Switch>
           <Route path="/quick-settings/contacts" component={Contacts} />
-          <Switch>
-            <Route path="/quick-settings/contacts/new" component={NewContact} />
-            <Route path="/quick-settings/contacts/:address">
-              {(params: { address: string }) => (
-                <ContactSettings address={params?.address} />
-              )}
-            </Route>
-          </Switch>
+          <Route path="/quick-settings/contacts/:address">
+            {(params: { address: string }) =>
+              params.address.startsWith("new") ? (
+                <NewContact />
+              ) : (
+                <ContactSettings address={params.address} />
+              )
+            }
+          </Route>
           <Route
             path="/quick-settings/notifications"
             component={NotificationSettings}
diff --git a/src/wallets/index.ts b/src/wallets/index.ts
index cefc32977..2582317bc 100644
--- a/src/wallets/index.ts
+++ b/src/wallets/index.ts
@@ -73,6 +73,13 @@ export function useSetUp() {
         case undefined:
         case "extension": {
           if (!hasWallets) {
+            const allStoredKeys = Object.keys(
+              (await browser.storage.local.get(null)) || {}
+            );
+            await Promise.all(
+              allStoredKeys.map((key) => ExtensionStorage.remove(key))
+            );
+
             await browser.tabs.create({
               url: browser.runtime.getURL("tabs/welcome.html")
             });