diff --git a/src/components/ModForm.tsx b/src/components/ModForm.tsx
index c3f5a02..7411c47 100644
--- a/src/components/ModForm.tsx
+++ b/src/components/ModForm.tsx
@@ -192,7 +192,7 @@ export const ModForm = ({ existingModData }: ModFormProps) => {
       return
     }
 
-    const uuid = uuidv4()
+    const uuid = formState.dTag || uuidv4()
     const currentTimeStamp = now()
 
     const aTag =
@@ -204,7 +204,7 @@ export const ModForm = ({ existingModData }: ModFormProps) => {
       pubkey: hexPubkey,
       content: formState.body,
       tags: [
-        ['d', formState.dTag || uuid],
+        ['d', uuid],
         ['a', aTag],
         ['r', formState.rTag],
         ['t', T_TAG_VALUE],