diff --git a/.replit b/.replit
index 10afe05..11b60bb 100644
--- a/.replit
+++ b/.replit
@@ -16,7 +16,7 @@ localPort = 5000
 externalPort = 80
 
 [[ports]]
-localPort = 43411
+localPort = 40259
 externalPort = 3000
 
 [env]
diff --git a/client/src/components/video-card.tsx b/client/src/components/video-card.tsx
index 768d808..497680b 100644
--- a/client/src/components/video-card.tsx
+++ b/client/src/components/video-card.tsx
@@ -157,28 +157,53 @@ export default function VideoCard({ video, onClick, className = "", hideOverlay
         hlsRef.current = hls;
         
         hls.on(Hls.Events.MANIFEST_PARSED, () => {
-          // Set muted state before playing
+          // Set muted state and volume before playing
           videoElement.muted = isMuted;
+          if (isMuted) {
+            videoElement.volume = 0;
+          } else if (videoElement.volume === 0) {
+            videoElement.volume = 0.8;
+          }
           videoElement.play().catch(e => console.log('Preview autoplay failed:', e));
         });
         
         hls.on(Hls.Events.MEDIA_ATTACHED, () => {
-          // Set muted state after media is attached
+          // Set muted state and volume after media is attached
           videoElement.muted = isMuted;
+          if (isMuted) {
+            videoElement.volume = 0;
+          } else if (videoElement.volume === 0) {
+            videoElement.volume = 0.8;
+          }
           videoElement.addEventListener('loadedmetadata', () => {
             setDuration(videoElement.duration);
-            // Ensure muted state is preserved after metadata loads
+            // Ensure muted state and volume are preserved after metadata loads
             videoElement.muted = isMuted;
+            if (isMuted) {
+              videoElement.volume = 0;
+            } else if (videoElement.volume === 0) {
+              videoElement.volume = 0.8;
+            }
           });
         });
       } else if (videoElement.canPlayType('application/vnd.apple.mpegurl')) {
         // Safari native HLS support
         videoElement.src = video.videoUrl;
         videoElement.muted = isMuted;
+        if (isMuted) {
+          videoElement.volume = 0;
+        } else if (videoElement.volume === 0) {
+          videoElement.volume = 0.8;
+        }
         videoElement.addEventListener('loadedmetadata', () => {
           setDuration(videoElement.duration);
-          // Ensure muted state is preserved after metadata loads
+          // Ensure muted state and volume are preserved after metadata loads
           videoElement.muted = isMuted;
+          if (isMuted) {
+            videoElement.volume = 0;
+          } else if (videoElement.volume === 0) {
+            videoElement.volume = 0.8;
+          }
         });
         videoElement.play().catch(e => console.log('Preview autoplay failed:', e));
       }
@@ -242,25 +267,37 @@ export default function VideoCard({ video, onClick, className = "", hideOverlay
               controls={false}
               disablePictureInPicture
               onLoadStart={() => {
-                // Force muted state on load start
+                // Set muted state and appropriate volume on load start
                 if (videoRef.current) {
                   videoRef.current.muted = isMuted;
-                  videoRef.current.volume = 0;
+                  if (isMuted) {
+                    videoRef.current.volume = 0;
+                  } else if (videoRef.current.volume === 0) {
+                    videoRef.current.volume = 0.8;
+                  }
                 }
               }}
               onError={() => {}}
               onPlay={() => {
-                // Force muted state on play
+                // Set muted state and appropriate volume on play
                 if (videoRef.current) {
                   videoRef.current.muted = isMuted;
-                  videoRef.current.volume = 0;
+                  if (isMuted) {
+                    videoRef.current.volume = 0;
+                  } else if (videoRef.current.volume === 0) {
+                    videoRef.current.volume = 0.8;
+                  }
                 }
               }}
               onCanPlay={() => {
-                // Force muted state when video can play
+                // Set muted state and appropriate volume when video can play
                 if (videoRef.current) {
                   videoRef.current.muted = isMuted;
-                  videoRef.current.volume = 0;
+                  if (isMuted) {
+                    videoRef.current.volume = 0;
+                  } else if (videoRef.current.volume === 0) {
+                    videoRef.current.volume = 0.8;
+                  }
                 }
               }}
               onTimeUpdate={(e) => setCurrentTime(e.currentTarget.currentTime)}
@@ -313,13 +350,22 @@ export default function VideoCard({ video, onClick, className = "", hideOverlay
                   try {
                     videoRef.current.muted = newMutedState;
                     if (!newMutedState) {
-                      // When unmuting, ensure volume is audible
-                      videoRef.current.volume = 0.8;
+                      // When unmuting, ensure volume is audible and play if paused
+                      if (videoRef.current.volume === 0) {
+                        videoRef.current.volume = 0.8;
+                      }
+                      if (videoRef.current.paused) {
+                        videoRef.current.play().catch(e => console.log('Unmute play failed:', e));
+                      }
+                    } else {
+                      // When muting, set volume to 0
+                      videoRef.current.volume = 0;
                     }
                     console.log('🔊 Mute button clicked:', { 
                       newMutedState, 
                       videoMuted: videoRef.current.muted, 
-                      videoVolume: videoRef.current.volume 
+                      videoVolume: videoRef.current.volume,
+                      videoPaused: videoRef.current.paused 
                     });
                   } catch (error) {
                     console.error('Error setting video audio:', error);