diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index 20d282f72..8d217b2b2 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -625,7 +625,7 @@ export default function NodeToolbarComponent({
                   />
                 </SelectItem>
               )}
-              {(!hasStore || !hasApiKey || !validApiKey) && (
+              {/* {(!hasStore || !hasApiKey || !validApiKey) && (
                 <SelectItem value={"Download"}>
                   <ToolbarSelectItem
                     shortcut={
@@ -637,7 +637,7 @@ export default function NodeToolbarComponent({
                     dataTestId="Download-button-modal"
                   />
                 </SelectItem>
-              )}
+              )} */}
               <SelectItem
                 value={"documentation"}
                 disabled={data.node?.documentation === ""}
@@ -687,16 +687,19 @@ export default function NodeToolbarComponent({
                   style={`${frozen ? " text-ice" : ""} transition-all`}
                 />
               </SelectItem>
-              <SelectItem value="Download">
-                <ToolbarSelectItem
-                  shortcut={
-                    shortcuts.find((obj) => obj.name === "Download")?.shortcut!
-                  }
-                  value={"Download"}
-                  icon={"Download"}
-                  dataTestId="download-button-modal"
-                />
-              </SelectItem>
+              {(!hasStore || !hasApiKey || !validApiKey) && (
+                <SelectItem value="Download">
+                  <ToolbarSelectItem
+                    shortcut={
+                      shortcuts.find((obj) => obj.name === "Download")
+                        ?.shortcut!
+                    }
+                    value={"Download"}
+                    icon={"Download"}
+                    dataTestId="download-button-modal"
+                  />
+                </SelectItem>
+              )}
               <SelectItem
                 value={"delete"}
                 className="focus:bg-red-400/[.20]"
diff --git a/src/frontend/src/pages/SettingsPage/pages/GeneralPage/components/ProfilePictureForm/index.tsx b/src/frontend/src/pages/SettingsPage/pages/GeneralPage/components/ProfilePictureForm/index.tsx
index 0536b2b7b..935d96c25 100644
--- a/src/frontend/src/pages/SettingsPage/pages/GeneralPage/components/ProfilePictureForm/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/GeneralPage/components/ProfilePictureForm/index.tsx
@@ -45,6 +45,7 @@ const ProfilePictureFormComponent = ({
               } else {
                 prev[folder] = [path];
               }
+              setLoading(false);
               return prev;
             });
           });