diff --git a/apps/web/components/editor/pdf-signer.tsx b/apps/web/components/editor/pdf-signer.tsx
index dbbf1f9d6..113c165db 100644
--- a/apps/web/components/editor/pdf-signer.tsx
+++ b/apps/web/components/editor/pdf-signer.tsx
@@ -135,7 +135,7 @@ export default function PDFSigner(props: any) {
       <PDFViewer
         style={{
           cursor:
-            signatureFields === 0
+            signatureFields.length === 0
               ? `url("https://place-hold.it/110x64/37f095/ffffff&text=Signature") 55 32, auto`
               : "",
         }}
@@ -145,7 +145,8 @@ export default function PDFSigner(props: any) {
         pdfUrl={`${NEXT_PUBLIC_WEBAPP_URL}/api/documents/${router.query.id}?token=${router.query.token}`}
         onClick={onClick}
         onMouseDown={function onMouseDown(e: any, page: number) {
-          if (signatureFields === 0) addFreeSignature(e, page, props.recipient);
+          if (signatureFields.length === 0)
+            addFreeSignature(e, page, props.recipient);
         }}
         onMouseUp={() => {}}
         onDelete={onDeleteHandler}
diff --git a/apps/web/components/editor/pdf-viewer.jsx b/apps/web/components/editor/pdf-viewer.jsx
index fa6bb5a30..4fc1d5a4d 100644
--- a/apps/web/components/editor/pdf-viewer.jsx
+++ b/apps/web/components/editor/pdf-viewer.jsx
@@ -83,7 +83,7 @@ export default function PDFViewer(props) {
                       ></SignableField>
                     ) : (
                       <EditableField
-                        hidden={item.Signature}
+                        hidden={item.Signature || item.inserted}
                         key={item.id}
                         field={item}
                         className="absolute"
diff --git a/apps/web/pages/api/documents/[id]/fields/index.ts b/apps/web/pages/api/documents/[id]/fields/index.ts
index 4497bdc56..9aa2366d1 100644
--- a/apps/web/pages/api/documents/[id]/fields/index.ts
+++ b/apps/web/pages/api/documents/[id]/fields/index.ts
@@ -75,6 +75,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
       documentId: +documentId,
       type: body.type,
       page: +body.page,
+      inserted: false,
       positionX: +body.positionX,
       positionY: +body.positionY,
       customText: body.customText,