diff --git a/components/upvote.js b/components/upvote.js
index 7543558b..b7ca3d40 100644
--- a/components/upvote.js
+++ b/components/upvote.js
@@ -160,6 +160,7 @@ export default function UpVote ({ item, className }) {
 
     if (pending) {
       controller.abort()
+      setController(null)
       return
     }
     const c = new ZapUndoController()
@@ -186,6 +187,7 @@ export default function UpVote ({ item, className }) {
 
       if (pending) {
         controller.abort()
+        setController(null)
         return
       }
       const c = new ZapUndoController()
@@ -197,7 +199,7 @@ export default function UpVote ({ item, className }) {
     }
   }
 
-  const fillColor = hover ? nextColor : color
+  const fillColor = hover || pending ? nextColor : color
 
   return (
     <div ref={ref} className='upvoteParent'>
@@ -222,7 +224,7 @@ export default function UpVote ({ item, className }) {
                       ${meSats ? styles.voted : ''}
                       ${pending ? styles.pending : ''}`
                     }
-              style={meSats || hover
+              style={meSats || hover || pending
                 ? {
                     fill: fillColor,
                     filter: `drop-shadow(0 0 6px ${fillColor}90)`