diff --git a/image_analysis/geom_refinement/XtalOptimizer.cpp b/image_analysis/geom_refinement/XtalOptimizer.cpp
index a6d030b3..14a8d8dc 100644
--- a/image_analysis/geom_refinement/XtalOptimizer.cpp
+++ b/image_analysis/geom_refinement/XtalOptimizer.cpp
@@ -517,6 +517,7 @@ bool XtalOptimizerInternal(XtalOptimizerData &data,
         ceres::Solver::Options options;
         options.linear_solver_type = ceres::DENSE_QR;
         options.minimizer_progress_to_stdout = false;
+        options.max_solver_time_in_seconds = 0.02; // 20 ms - try not go longer
         options.logging_type = ceres::LoggingType::SILENT;
         ceres::Solver::Summary summary;