diff --git a/src/components/report/PhotoUpload.tsx b/src/components/report/PhotoUpload.tsx
index 9829b84..cebd28c 100644
--- a/src/components/report/PhotoUpload.tsx
+++ b/src/components/report/PhotoUpload.tsx
@@ -32,18 +32,17 @@ export function PhotoUpload({
 
   const extractEXIF = async (file: File): Promise<Partial<PhotoMetadata>> => {
     try {
+      // Parse GPS data separately to get computed latitude/longitude
+      const gpsData = await exifr.gps(file);
+      
+      // Parse other EXIF data for timestamp
       const exifData = await exifr.parse(file, {
-        gps: true,
-        pick: ['latitude', 'longitude', 'DateTimeOriginal', 'CreateDate']
+        pick: ['DateTimeOriginal', 'CreateDate', 'DateTime']
       });
 
-      if (!exifData) {
-        return { hasGPS: false };
-      }
-
-      const latitude = exifData.latitude;
-      const longitude = exifData.longitude;
-      const timestamp = exifData.DateTimeOriginal || exifData.CreateDate;
+      const latitude = gpsData?.latitude;
+      const longitude = gpsData?.longitude;
+      const timestamp = exifData?.DateTimeOriginal || exifData?.CreateDate || exifData?.DateTime;
 
       return {
         latitude: latitude !== undefined ? latitude : undefined,