diff --git a/packages/frontend/component/src/ui/audio-player/audio-player.stories.tsx b/packages/frontend/component/src/ui/audio-player/audio-player.stories.tsx
index 799142acff..9bd13f9094 100644
--- a/packages/frontend/component/src/ui/audio-player/audio-player.stories.tsx
+++ b/packages/frontend/component/src/ui/audio-player/audio-player.stories.tsx
@@ -253,6 +253,7 @@ const AudioWrapper = () => {
     <div
       style={{
         width: '100%',
+        minWidth: '600px',
         minHeight: '200px',
         border: '2px dashed #ccc',
         borderRadius: '8px',
@@ -305,7 +306,7 @@ const AudioWrapper = () => {
             playbackState={playbackState}
             seekTime={seekTime}
             duration={duration}
-            loading={loading}
+            loading={loading || waveform === null}
             onPlay={handlePlay}
             onPause={handlePause}
             onStop={handleStop}
diff --git a/packages/frontend/component/src/ui/audio-player/audio-player.tsx b/packages/frontend/component/src/ui/audio-player/audio-player.tsx
index 97574fe306..220c0939d6 100644
--- a/packages/frontend/component/src/ui/audio-player/audio-player.tsx
+++ b/packages/frontend/component/src/ui/audio-player/audio-player.tsx
@@ -82,12 +82,6 @@ export const AudioPlayer = ({
 
   // Calculate progress percentage
   const progressPercentage = duration > 0 ? seekTime / duration : 0;
-  const iconState = loading
-    ? 'loading'
-    : playbackState === 'playing'
-      ? 'pause'
-      : 'play';
-
   return (
     <div className={styles.root} onClick={onClick}>
       <div className={styles.upper}>
@@ -107,7 +101,7 @@ export const AudioPlayer = ({
           <AnimatedPlayIcon
             onClick={handlePlayToggle}
             className={styles.controlButton}
-            state={iconState}
+            state={playbackState === 'playing' ? 'pause' : 'play'}
           />
         </div>
       </div>
@@ -117,6 +111,7 @@ export const AudioPlayer = ({
           waveform={waveform || []}
           progress={progressPercentage}
           onManualSeek={handleProgressClick}
+          loading={loading}
         />
         <div className={styles.timeDisplay}>{formatTime(duration)}</div>
       </div>
@@ -183,12 +178,6 @@ export const MiniAudioPlayer = ({
 
   // Calculate progress percentage
   const progressPercentage = duration > 0 ? seekTime / duration : 0;
-  const iconState =
-    playbackState === 'playing'
-      ? 'pause'
-      : playbackState === 'paused'
-        ? 'play'
-        : 'loading';
 
   return (
     <div className={styles.miniRoot} onClick={onClick}>
@@ -203,7 +192,7 @@ export const MiniAudioPlayer = ({
         <AnimatedPlayIcon
           onClick={handlePlayToggle}
           className={styles.controlButton}
-          state={iconState}
+          state={playbackState === 'playing' ? 'pause' : 'play'}
         />
 
         <IconButton
diff --git a/packages/frontend/component/src/ui/audio-player/audio-waveform.tsx b/packages/frontend/component/src/ui/audio-player/audio-waveform.tsx
index 38c5e2dca1..b5a3bea63f 100644
--- a/packages/frontend/component/src/ui/audio-player/audio-waveform.tsx
+++ b/packages/frontend/component/src/ui/audio-player/audio-waveform.tsx
@@ -2,6 +2,7 @@ import { type AffineThemeKeyV2, cssVarV2 } from '@toeverything/theme/v2';
 import { clamp } from 'lodash-es';
 import { useCallback, useEffect, useRef } from 'react';
 
+import { Skeleton } from '../skeleton';
 import * as styles from './audio-waveform.css';
 
 // Helper function to get computed CSS variable value
@@ -113,11 +114,13 @@ export const AudioWaveform = ({
   progress,
   onManualSeek,
   mini = false, // the bar will be 0.5px instead. by default, the bar is 1px
+  loading = false,
 }: {
   waveform: number[];
   progress: number;
   onManualSeek: (progress: number) => void;
   mini?: boolean;
+  loading?: boolean;
 }) => {
   const containerRef = useRef<HTMLDivElement>(null);
   const canvasRef = useRef<HTMLCanvasElement>(null);
@@ -176,7 +179,11 @@ export const AudioWaveform = ({
       aria-valuemax={100}
       aria-valuenow={progress * 100}
     >
-      <canvas ref={canvasRef} style={{ width: '100%', height: '100%' }} />
+      {loading ? (
+        <Skeleton />
+      ) : (
+        <canvas ref={canvasRef} style={{ width: '100%', height: '100%' }} />
+      )}
     </div>
   );
 };
diff --git a/packages/frontend/component/src/ui/lottie/animated-play-icon.stories.tsx b/packages/frontend/component/src/ui/lottie/animated-play-icon.stories.tsx
index 5b555ed827..a6e93a5b16 100644
--- a/packages/frontend/component/src/ui/lottie/animated-play-icon.stories.tsx
+++ b/packages/frontend/component/src/ui/lottie/animated-play-icon.stories.tsx
@@ -30,13 +30,8 @@ Pause.args = {
   state: 'pause',
 };
 
-export const Loading = Template.bind({});
-Loading.args = {
-  state: 'loading',
-};
-
 export const WithStateToggle: StoryFn<typeof AnimatedPlayIcon> = () => {
-  const [state, setState] = useState<'play' | 'pause' | 'loading'>('play');
+  const [state, setState] = useState<'play' | 'pause'>('play');
 
   const cycleState = () => {
     setState(current => {
@@ -45,8 +40,6 @@ export const WithStateToggle: StoryFn<typeof AnimatedPlayIcon> = () => {
           return 'pause';
         case 'pause':
           return 'play';
-        case 'loading':
-          return 'play';
         default:
           return 'play';
       }
diff --git a/packages/frontend/component/src/ui/lottie/animated-play-icon.tsx b/packages/frontend/component/src/ui/lottie/animated-play-icon.tsx
index aa9b7df857..bd455e0b5d 100644
--- a/packages/frontend/component/src/ui/lottie/animated-play-icon.tsx
+++ b/packages/frontend/component/src/ui/lottie/animated-play-icon.tsx
@@ -4,12 +4,11 @@ import type { LottieRef } from 'lottie-react';
 import Lottie from 'lottie-react';
 import { useEffect, useRef } from 'react';
 
-import { Loading } from '../loading';
 import playandpause from './playandpause.json';
 import * as styles from './styles.css';
 
 export interface AnimatedPlayIconProps {
-  state: 'play' | 'pause' | 'loading';
+  state: 'play' | 'pause';
   className?: string;
   onClick?: (e: React.MouseEvent) => void;
 }
@@ -62,9 +61,6 @@ export const AnimatedPlayIcon = ({
   onClick,
 }: AnimatedPlayIconProps) => {
   const state = useDebouncedValue(_state, 25);
-  if (state === 'loading') {
-    return <Loading size={40} />;
-  }
   return (
     <PlayAndPauseIcon state={state} onClick={onClick} className={className} />
   );