diff --git a/stages/odm_dem.py b/stages/odm_dem.py
index ca242152..d91a18e8 100755
--- a/stages/odm_dem.py
+++ b/stages/odm_dem.py
@@ -101,7 +101,7 @@ class ODMDEMStage(types.ODM_Stage):
                             decimation=args.dem_decimation,
                             max_workers=args.max_concurrency,
                             keep_unfilled_copy=args.dem_euclidean_map,
-                            max_tiles=math.ceil(len(reconstruction.photos) / 2)
+                            max_tiles=None if reconstruction.has_geotagged_photos() else math.ceil(len(reconstruction.photos) / 2)
                         )
 
                     dem_geotiff_path = os.path.join(odm_dem_root, "{}.tif".format(product))
diff --git a/stages/odm_meshing.py b/stages/odm_meshing.py
index a113a989..6f5f603e 100644
--- a/stages/odm_meshing.py
+++ b/stages/odm_meshing.py
@@ -60,7 +60,7 @@ class ODMeshingStage(types.ODM_Stage):
                     available_cores=args.max_concurrency,
                     method='poisson' if args.fast_orthophoto else 'gridded',
                     smooth_dsm=True,
-                    max_tiles=math.ceil(len(reconstruction.photos) / 2))
+                    max_tiles=None if reconstruction.has_geotagged_photos() else math.ceil(len(reconstruction.photos) / 2))
           else:
               log.ODM_WARNING('Found a valid ODM 2.5D Mesh file in: %s' %
                               tree.odm_25dmesh)