diff --git a/govtool/backend/src/VVA/API.hs b/govtool/backend/src/VVA/API.hs
index ca7660358..06b9fd39f 100644
--- a/govtool/backend/src/VVA/API.hs
+++ b/govtool/backend/src/VVA/API.hs
@@ -296,22 +296,22 @@ getVotes (unHexText -> dRepId) selectedTypes sortMode mSearch = do
   CacheEnv {dRepGetVotesCache} <- asks vvaCache
   (votes, proposals) <- cacheRequest dRepGetVotesCache dRepId $ DRep.getVotes dRepId []
   
-  let voteMapByTxHash = Map.fromList $ 
-        map (\vote -> (pack $ Prelude.takeWhile (/= '#') (unpack $ Types.voteGovActionId vote), vote)) votes
+  let voteMapById = Map.fromList $
+        map (\vote -> (Types.voteGovActionId vote, vote)) votes
   
   processedProposals <- filter (isProposalSearchedFor mSearch) <$> 
                         mapSortAndFilterProposals selectedTypes sortMode proposals
   
-  return $
+  return
     [ VoteResponse
       { voteResponseVote = voteToResponse vote
       , voteResponseProposal = proposalResponse
       }
     | proposalResponse <- processedProposals
-    , let txHash = unHexText (proposalResponseTxHash proposalResponse)
-    , Just vote <- [Map.lookup txHash voteMapByTxHash]
+    , let govActionId = unHexText (proposalResponseTxHash proposalResponse) <> "#" <> pack (show $ proposalResponseIndex proposalResponse)
+    , Just vote <- [Map.lookup govActionId voteMapById]
     ]
-
+    
 drepInfo :: App m => HexText -> m DRepInfoResponse
 drepInfo (unHexText -> dRepId) = do
   CacheEnv {dRepInfoCache} <- asks vvaCache
diff --git a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
index b2e6e6fa4..878527c02 100644
--- a/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
+++ b/govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from "react";
+import { useState, useEffect, useCallback, useMemo } from "react";
 import { Box, CircularProgress, Tab, Tabs, styled } from "@mui/material";
 import { useLocation, useNavigate } from "react-router-dom";
 
@@ -107,7 +107,33 @@ export const DashboardGovernanceActions = () => {
     debouncedSearchText,
   );
 
-const filteredProposals = proposals;
+  // White Magic :)
+  const shouldFilter =
+  voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter;
+
+const filteredProposals = useMemo(() => {
+  if (!shouldFilter || !proposals || !votes) return proposals;
+
+  return proposals
+    .map((proposalCategory) => {
+      const filteredActions = proposalCategory.actions.filter((action) => {
+        const hasVote = votes.some((voteCategory) =>
+          voteCategory.actions.some(
+            (voteAction) =>
+              voteAction.proposal.txHash === action.txHash &&
+              voteAction.proposal.index === action.index,
+          ),
+        );
+        return !hasVote;
+      });
+
+      return {
+        ...proposalCategory,
+        actions: filteredActions,
+      };
+    })
+    .filter((category) => category.actions.length > 0);
+}, [proposals, votes, shouldFilter]);
 
   const { state } = useLocation();
   const [content, setContent] = useState<number>(