diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditAvatar.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditAvatar.tsx
index 72d839b2ad..04598f03bc 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditAvatar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditAvatar.tsx
@@ -52,6 +52,9 @@ export function EditAvatar({ session, environmentId }: { session: Session; envir
       toast.error("Avatar update failed. Please try again.");
     } finally {
       setIsLoading(false);
+      if (inputRef.current) {
+        inputRef.current.value = "";
+      }
     }
   };
 
diff --git a/packages/lib/storage/service.ts b/packages/lib/storage/service.ts
index 8ee7de0b9e..1ae386bfb9 100644
--- a/packages/lib/storage/service.ts
+++ b/packages/lib/storage/service.ts
@@ -43,7 +43,7 @@ export const getS3Client = () => {
     s3ClientInstance = new S3Client({
       credentials,
       region: S3_REGION,
-      endpoint: S3_ENDPOINT_URL,
+      ...(S3_ENDPOINT_URL && { endpoint: S3_ENDPOINT_URL }),
     });
   }