diff --git a/web/src/components/AvatarPicker.tsx b/web/src/components/AvatarPicker.tsx
index 4f6711f6..1492fa25 100644
--- a/web/src/components/AvatarPicker.tsx
+++ b/web/src/components/AvatarPicker.tsx
@@ -4,6 +4,7 @@ import { showToasts, t } from 'tailchat-shared';
 import { Avatar } from 'antd';
 import { Icon } from '@iconify/react';
 import { ModalAvatarCropper } from './modals/AvatarCropper';
+import { isGIF } from '@/utils/file-helper';
 
 interface AvatarPickerProps {
   className?: string;
@@ -16,35 +17,45 @@ interface AvatarPickerProps {
  */
 export const AvatarPicker: React.FC<AvatarPickerProps> = React.memo((props) => {
   const fileRef = useRef<HTMLInputElement>(null);
-  const [cropUrl, setCropUrl] = useState<string>(props.imageUrl || ''); // 裁剪后并使用的url
+  const [avatarUrl, setAvatarUrl] = useState<string>(props.imageUrl || ''); // 裁剪后并使用的url/或者未经裁剪的 gif url
+
+  const updateAvatar = (imageBlobUrl: string) => {
+    setAvatarUrl(imageBlobUrl);
+
+    if (typeof props.onChange === 'function') {
+      props.onChange(imageBlobUrl);
+    }
+  };
 
   const handleSelectFile = (e: React.ChangeEvent<HTMLInputElement>) => {
     if (e.target.files && e.target.files.length > 0) {
-      const reader = new FileReader();
-      reader.addEventListener('load', () => {
-        if (reader.result) {
-          const key = openModal(
-            <ModalAvatarCropper
-              imageUrl={reader.result.toString()}
-              onConfirm={(croppedImageBlobUrl) => {
-                closeModal(key);
-                setCropUrl(croppedImageBlobUrl);
+      const pickedFile = e.target.files[0];
 
-                if (typeof props.onChange === 'function') {
-                  props.onChange(croppedImageBlobUrl);
-                }
-              }}
-            />,
-            {
-              maskClosable: false,
-              closable: true,
-            }
-          );
-        } else {
-          showToasts(t('文件读取失败'), 'error');
-        }
-      });
-      reader.readAsDataURL(e.target.files[0]);
+      if (isGIF(pickedFile)) {
+        updateAvatar(URL.createObjectURL(pickedFile));
+      } else {
+        const reader = new FileReader();
+        reader.addEventListener('load', () => {
+          if (reader.result) {
+            const key = openModal(
+              <ModalAvatarCropper
+                imageUrl={reader.result.toString()}
+                onConfirm={(croppedImageBlobUrl) => {
+                  closeModal(key);
+                  updateAvatar(croppedImageBlobUrl);
+                }}
+              />,
+              {
+                maskClosable: false,
+                closable: true,
+              }
+            );
+          } else {
+            showToasts(t('文件读取失败'), 'error');
+          }
+        });
+        reader.readAsDataURL(pickedFile);
+      }
 
       // 清理选中状态
       e.target.files = null;
@@ -71,7 +82,7 @@ export const AvatarPicker: React.FC<AvatarPickerProps> = React.memo((props) => {
           <Avatar
             size={64}
             icon={<Icon className="anticon" icon="mdi:account" />}
-            src={cropUrl}
+            src={avatarUrl}
           />
         )}
       </div>
diff --git a/web/src/components/Modal.tsx b/web/src/components/Modal.tsx
index 3379a07d..ad4d7030 100644
--- a/web/src/components/Modal.tsx
+++ b/web/src/components/Modal.tsx
@@ -88,7 +88,7 @@ export const Modal: React.FC<ModalProps> = React.memo((props) => {
         <ModalContext.Provider value={{ closeModal }}>
           {/* Inner */}
           <div
-            className="modal-inner bg-content-light dark:bg-content-dark rounded overflow-auto relative"
+            className="modal-inner bg-content-light dark:bg-content-dark rounded overflow-auto relative z-10"
             style={{ maxHeight: '80vh', maxWidth: '80vw' }}
             onClick={stopPropagation}
           >
diff --git a/web/src/utils/file-helper.ts b/web/src/utils/file-helper.ts
index eb740deb..de28a022 100644
--- a/web/src/utils/file-helper.ts
+++ b/web/src/utils/file-helper.ts
@@ -114,3 +114,12 @@ export async function openFile(
     fileEl.click();
   });
 }
+
+/**
+ * Judge GIF File type by mime type
+ * @param file File object
+ * @returns if passed file object is a gif image.
+ */
+export const isGIF = (file: File): boolean => {
+  return file.type === 'image/gif';
+};