diff --git a/frontend/src/components/Dialogs/F2fMap.tsx b/frontend/src/components/Dialogs/F2fMap.tsx
index d9b7f371..50c447c0 100644
--- a/frontend/src/components/Dialogs/F2fMap.tsx
+++ b/frontend/src/components/Dialogs/F2fMap.tsx
@@ -17,8 +17,8 @@ import Map from '../Map';
 interface Props {
   open: boolean;
   orderType: number;
-  latitude?: number;
-  longitude?: number;
+  latitude?: number | null;
+  longitude?: number | null;
   onClose?: (position?: [number, number]) => void;
   interactive?: boolean;
   zoom?: number;
diff --git a/frontend/src/components/MakerForm/MakerForm.tsx b/frontend/src/components/MakerForm/MakerForm.tsx
index 5c4634e3..cf8c1a28 100644
--- a/frontend/src/components/MakerForm/MakerForm.tsx
+++ b/frontend/src/components/MakerForm/MakerForm.tsx
@@ -176,12 +176,12 @@ const MakerForm = ({
   const handlePaymentMethodChange = function (paymentArray: string[]): void {
     let str = '';
     const arrayLength = paymentArray.length;
-    let includeCoordinates = false;
+    let includesCash = false;
 
     for (let i = 0; i < arrayLength; i++) {
       str += paymentArray[i] + ' ';
-      if (paymentArray[i] === 'cash') {
-        includeCoordinates = true;
+      if (paymentArray[i].includes('F2F')) {
+        includesCash = true;
         if (i === arrayLength - 1) {
           setOpenWorldmap(true);
         }
@@ -195,8 +195,8 @@ const MakerForm = ({
         paymentMethods: paymentArray,
         paymentMethodsText: paymentMethodText,
         badPaymentMethod: paymentMethodText.length > 50,
-        latitude: includeCoordinates ? maker.latitude : null,
-        longitude: includeCoordinates ? maker.longitude : null,
+        latitude: includesCash ? maker.latitude : null,
+        longitude: includesCash ? maker.longitude : null,
       };
     });
   };