diff --git a/src/Handler/Utils/Avs.hs b/src/Handler/Utils/Avs.hs
index f772b0a4e..b3e3dfd8f 100644
--- a/src/Handler/Utils/Avs.hs
+++ b/src/Handler/Utils/Avs.hs
@@ -531,9 +531,13 @@ lookupAvsUsers apis = do
 -- | Like `Handler.Utils.getReceivers`, but calls upsertAvsUserById on each user to ensure that postal address is up-to-date
 updateReceivers :: UserId -> Handler  (Entity User, [Entity User], Bool)
 updateReceivers uid = do
-  (underling :: Entity User, avsUnderling :: Maybe (Entity UserAvs), avsSupers :: [(E.Value UserId, E.Value (Maybe AvsPersonId))]) <- runDB $ (,,)
-    <$> getJustEntity uid
-    <*> getBy (UniqueUserAvsUser uid)
+  -- First perform AVS update for receiver
+  runDB (getBy (UniqueUserAvsUser uid)) >>= \case 
+      Just Entity{entityVal=UserAvs{userAvsPersonId = apid}} -> void . maybeCatchAll $ upsertAvsUserById apid
+      Nothing -> return ()    
+  -- Retrieve updated user and supervisors now
+  (underling :: Entity User, avsSupers :: [(E.Value UserId, E.Value (Maybe AvsPersonId))]) <- runDB $ (,)
+    <$> getJustEntity uid    
     <*> (E.select $ do
           (usrSuper :& usrAvs) <-
             E.from $     E.table @UserSupervisor            
@@ -544,10 +548,9 @@ updateReceivers uid = do
           pure (usrSuper E.^. UserSupervisorSupervisor, usrAvs E.?. UserAvsPersonId)
         )
   let (superVs, avsIds) = unzip avsSupers
-      receiverIDs :: [UserId] = E.unValue <$> superVs
-      underlingAvsId = userAvsPersonId . entityVal <$> avsUnderling
-      toUpdate = Set.fromList $ catMaybes (underlingAvsId : (E.unValue <$> avsIds))      
-      directResult = return (underling, pure underling, True)
+      receiverIDs :: [UserId] = E.unValue <$> superVs      
+      toUpdate = Set.fromList $ mapMaybe E.unValue avsIds
+      directResult = return (underling, pure underling, True)     -- already contains updated address
   forM_ toUpdate (void . maybeCatchAll . upsertAvsUserById)       -- attempt to update postaddress from AVS  
   if null receiverIDs 
     then directResult