diff --git a/components/Blocks/PollBlock.tsx b/components/Blocks/PollBlock.tsx
index 86e55eeb..af3b942b 100644
--- a/components/Blocks/PollBlock.tsx
+++ b/components/Blocks/PollBlock.tsx
@@ -112,9 +112,19 @@ export const PollBlock = (props: BlockProps) => {
 };
 
 const PollVote = (props: { entityID: string; onSubmit: () => void }) => {
+  let { data, mutate } = usePollData();
   let pollOptions = useEntity(props.entityID, "poll/options");
-  let [selectedPollOptions, setSelectedPollOptions] = useState<string[]>([]);
-  let { mutate } = usePollData();
+  let currentVotes = data?.voter_token
+    ? data.polls
+        .filter(
+          (p) =>
+            p.poll_votes_on_entity.poll_entity === props.entityID &&
+            p.poll_votes_on_entity.voter_token === data.voter_token,
+        )
+        .map((v) => v.poll_votes_on_entity.option_entity)
+    : [];
+  let [selectedPollOptions, setSelectedPollOptions] =
+    useState<string[]>(currentVotes);
 
   return (
     <>
@@ -161,7 +171,11 @@ const PollVote = (props: { entityID: string; onSubmit: () => void }) => {
           });
           props.onSubmit();
         }}
-        disabled={selectedPollOptions.length === 0}
+        disabled={
+          selectedPollOptions.length === 0 ||
+          (selectedPollOptions.length === currentVotes.length &&
+            selectedPollOptions.every((s) => currentVotes.includes(s)))
+        }
       >
         Vote!
       </ButtonPrimary>
@@ -419,8 +433,8 @@ const EditPollOption = (props: {
       <button
         disabled={props.disabled}
         className="text-accent-contrast disabled:text-border"
-        onMouseDown={() => {
-          rep?.mutate.removePollOption({ optionEntity: props.entityID });
+        onMouseDown={async () => {
+          await rep?.mutate.removePollOption({ optionEntity: props.entityID });
         }}
       >
         <CloseTiny />
diff --git a/src/replicache/index.tsx b/src/replicache/index.tsx
index f27e3809..7470135b 100644
--- a/src/replicache/index.tsx
+++ b/src/replicache/index.tsx
@@ -172,8 +172,19 @@ export function useEntity<A extends keyof typeof Attributes>(
     },
   );
   let d = data || fallbackData;
-  return Attributes[attribute].cardinality === "many"
-    ? (d as CardinalityResult<A>)
+  let a = Attributes[attribute];
+  return a.cardinality === "many"
+    ? ((a.type === "ordered-reference"
+        ? d.sort((a, b) => {
+            return (
+              a as Fact<keyof FilterAttributes<{ type: "ordered-reference" }>>
+            ).data.position >
+              (b as Fact<keyof FilterAttributes<{ type: "ordered-reference" }>>)
+                .data.position
+              ? 1
+              : -1;
+          })
+        : d) as CardinalityResult<A>)
     : d.length === 0 && data === null
       ? (null as CardinalityResult<A>)
       : (d[0] as CardinalityResult<A>);
diff --git a/src/replicache/mutations.ts b/src/replicache/mutations.ts
index f5159579..a813b8e9 100644
--- a/src/replicache/mutations.ts
+++ b/src/replicache/mutations.ts
@@ -594,7 +594,7 @@ const addPollOption: Mutation<{
 const removePollOption: Mutation<{
   optionEntity: string;
 }> = async (args, ctx) => {
-  ctx.deleteEntity(args.optionEntity);
+  await ctx.deleteEntity(args.optionEntity);
 };
 
 export const mutations = {
diff --git a/src/utils/elementId.ts b/src/utils/elementId.ts
index 9e9e1478..dc0cb17c 100644
--- a/src/utils/elementId.ts
+++ b/src/utils/elementId.ts
@@ -3,6 +3,7 @@ export const elementId = {
     text: `block/${id}/content`,
     container: `block/${id}/container`,
     input: `block/${id}/input`,
+    pollInput: (entity: string) => `block/${id}/poll-input/${entity}`,
   }),
   page: (id: string) => ({
     container: `page/${id}/container`,