diff --git a/client/src/components/payment-modal/payment-modal.container.jsx b/client/src/components/payment-modal/payment-modal.container.jsx
index c72bd224a..650a4857c 100644
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -178,21 +178,24 @@ function PaymentModalContainer({
         </span>
       }
     >
-      <Space>
-        <PaymentReexportButton payment={context} refetch={actions.refetch} />
-        <PaymentMarkForExportButton
-          bodyshop={bodyshop}
-          payment={context}
-          refetch={actions.refetch}
-        />
-      </Space>
+      {!context || (context && !context.id) ? null : (
+        <Space>
+          <PaymentReexportButton payment={context} refetch={actions.refetch} />
+          <PaymentMarkForExportButton
+            bodyshop={bodyshop}
+            payment={context}
+            refetch={actions.refetch}
+          />
+        </Space>
+      )}
+
       <Form
         onFinish={handleFinish}
         autoComplete={"off"}
         form={form}
         layout="vertical"
         initialValues={context || {}}
-        disabled={context.exportedat}
+        disabled={context?.exportedat}
       >
         <PaymentForm form={form} />
       </Form>