diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8d180e22..58c479c3 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,7 @@
 ## 1.0.0.rc.82
 This is an UNSTABLE release.
 
+* jfjoch_viewer: Enable FFTW based indexing in viewer (very slow at the moment)
 * Frontend: Minor fixes
 * Build scripts: Minor fixes to FFTW
 
diff --git a/reader/JFJochHDF5Reader.cpp b/reader/JFJochHDF5Reader.cpp
index 19dae610..39a941f9 100644
--- a/reader/JFJochHDF5Reader.cpp
+++ b/reader/JFJochHDF5Reader.cpp
@@ -53,6 +53,7 @@ void JFJochHDF5Reader::ReadFile(const std::string& filename) {
         auto dataset = std::make_shared<JFJochReaderDataset>();
         master_file = std::make_unique<HDF5ReadOnlyFile>(filename);
         dataset->experiment.DetectIceRings(true);
+        dataset->experiment.IndexingAlgorithm(IndexingAlgorithmEnum::Auto);
 
         std::filesystem::path fsPath(filename);
         dataset->experiment.FilePrefix(dataset_name(filename));
diff --git a/reader/JFJochHttpReader.cpp b/reader/JFJochHttpReader.cpp
index b3f1e411..08bc17bc 100644
--- a/reader/JFJochHttpReader.cpp
+++ b/reader/JFJochHttpReader.cpp
@@ -58,6 +58,7 @@ std::shared_ptr<JFJochReaderDataset>  JFJochHttpReader::UpdateDataset_i() {
 
         auto dataset = std::make_shared<JFJochReaderDataset>();
         dataset->experiment.DetectIceRings(true);
+        dataset->experiment.IndexingAlgorithm(IndexingAlgorithmEnum::Auto);
 
         // JFJochReader is always using int32_t
         dataset->experiment.BitDepthImage(32);
diff --git a/viewer/JFJochViewerWindow.cpp b/viewer/JFJochViewerWindow.cpp
index 485a4670..5b617da1 100644
--- a/viewer/JFJochViewerWindow.cpp
+++ b/viewer/JFJochViewerWindow.cpp
@@ -34,6 +34,8 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     SpotFindingSettings spot_finding_settings = DiffractionExperiment::DefaultDataProcessingSettings();
     IndexingSettings indexing_settings;
     spot_finding_settings.high_resolution_limit = 0.5;
+    spot_finding_settings.indexing = false;
+
     indexing_settings.IndexingThreads(1);
     indexing_settings.Algorithm(IndexingAlgorithmEnum::Auto);