diff --git a/packages/manager/apps/procedures/src/pages/rgdp/rgdpForm/RGDPForm.component.tsx b/packages/manager/apps/procedures/src/pages/rgdp/rgdpForm/RGDPForm.component.tsx
index 750449dcfb79..5e42c9aaaa42 100644
--- a/packages/manager/apps/procedures/src/pages/rgdp/rgdpForm/RGDPForm.component.tsx
+++ b/packages/manager/apps/procedures/src/pages/rgdp/rgdpForm/RGDPForm.component.tsx
@@ -47,7 +47,7 @@ export const RGDPForm: FunctionComponent = () => {
 
   const [showConfirmModal, setShowConfirmModal] = useState<boolean>(false);
   const [showSuccessModal, setShowSuccessModal] = useState<boolean>(false);
-  const { useUploadDocuments, useUploadLinks } = useProcedures('GDPR');
+  const { useUploadDocuments, useUploadLinks } = useProcedures('gdpr');
 
   const {
     mutate: uploadDocuments,
@@ -94,7 +94,7 @@ export const RGDPForm: FunctionComponent = () => {
       email,
       category,
       description,
-      nichandle,
+      ...(nichandle !== null ? { nichandle } : {}),
       firstName,
       name,
       numberOfDocuments: extractFiles(data).length,
diff --git a/packages/manager/apps/procedures/src/types/procedure.ts b/packages/manager/apps/procedures/src/types/procedure.ts
index a7802638add0..f82eb6ed9743 100644
--- a/packages/manager/apps/procedures/src/types/procedure.ts
+++ b/packages/manager/apps/procedures/src/types/procedure.ts
@@ -1 +1 @@
-export type Procedure = '2FA' | 'GDPR';
+export type Procedure = '2FA' | 'gdpr';