diff --git a/app/javascript/mastodon/features/status/components/refresh_controller.tsx b/app/javascript/mastodon/features/status/components/refresh_controller.tsx
index 171abc3c373..5f6c5643127 100644
--- a/app/javascript/mastodon/features/status/components/refresh_controller.tsx
+++ b/app/javascript/mastodon/features/status/components/refresh_controller.tsx
@@ -130,10 +130,15 @@ export const RefreshController: React.FC<{
   useEffect(() => {
     // Hide success message after a short delay
     if (loadingState === 'success') {
-      setTimeout(() => {
+      const timeoutId = setTimeout(() => {
         setLoadingState('idle');
       }, 3000);
+
+      return () => {
+        clearTimeout(timeoutId);
+      };
     }
+    return () => '';
   }, [loadingState]);
 
   const handleClick = useCallback(() => {