diff --git a/src/frontend/src/modals/genericModal/index.tsx b/src/frontend/src/modals/genericModal/index.tsx
index 8be3f8aaa..cd8f1408e 100644
--- a/src/frontend/src/modals/genericModal/index.tsx
+++ b/src/frontend/src/modals/genericModal/index.tsx
@@ -90,7 +90,6 @@ export default function GenericModal({
             value={myValue}
             onChange={(e) => {
               setMyValue(e.target.value);
-              setValue(e.target.value);
             }}
             placeholder="Type message here."
           />
@@ -100,6 +99,7 @@ export default function GenericModal({
           <Button
             className="mt-3"
             onClick={() => {
+              setValue(myValue);
               switch (myModalType) {
                 case 1:
                   setModalOpen(false);
diff --git a/src/frontend/src/modals/textAreaModal/index.tsx b/src/frontend/src/modals/textAreaModal/index.tsx
index f1e47b738..cd74a426d 100644
--- a/src/frontend/src/modals/textAreaModal/index.tsx
+++ b/src/frontend/src/modals/textAreaModal/index.tsx
@@ -11,7 +11,7 @@ export default function TextAreaModal({
   setValue,
 }: {
   setValue: (value: string) => void;
-  value: string | string[];
+  value: string;
 }) {
   const [open, setOpen] = useState(true);
   const [myValue, setMyValue] = useState(value);
@@ -96,7 +96,6 @@ export default function TextAreaModal({
                           value={myValue}
                           onChange={(e) => {
                             setMyValue(e.target.value);
-                            setValue(e.target.value);
                           }}
                         />
                       </div>
@@ -107,6 +106,7 @@ export default function TextAreaModal({
                       type="button"
                       className="inline-flex w-full justify-center rounded-md border border-transparent px-4 py-2 text-base font-medium text-background shadow-sm hover:bg-ring focus:outline-none focus:ring-1 focus:ring-ring focus:ring-offset-1 sm:ml-3 sm:w-auto sm:text-sm"
                       onClick={() => {
+                        setValue(myValue);
                         setModalOpen(false);
                       }}
                     >