diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp
index 1b38bcaa7..4bdbbe0ff 100644
--- a/slsDetectorSoftware/src/Detector.cpp
+++ b/slsDetectorSoftware/src/Detector.cpp
@@ -2131,6 +2131,7 @@ void Detector::setAdditionalJsonParameter(const std::string &key,
 void Detector::programFPGA(const std::string &fname, Positions pos) {
     std::vector<char> buffer = pimpl->readProgrammingFile(fname);
     pimpl->Parallel(&Module::programFPGA, pos, buffer);
+    rebootController(pos);
 }
 
 void Detector::resetFPGA(Positions pos) {
@@ -2153,7 +2154,6 @@ void Detector::updateFirmwareAndServer(const std::string &sname,
                                        Positions pos) {
     pimpl->Parallel(&Module::copyDetectorServer, pos, sname, hostname);
     programFPGA(fname, pos);
-    rebootController(pos);
 }
 
 Result<uint32_t> Detector::readRegister(uint32_t addr, Positions pos) const {
diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp
index e83cd4010..c14cd84e1 100644
--- a/slsDetectorSoftware/src/Module.cpp
+++ b/slsDetectorSoftware/src/Module.cpp
@@ -3490,12 +3490,7 @@ void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
            << " returned error: " << client.readErrorMessage();
         throw RuntimeError(os.str());
     }
-    if (moduleIndex == 0) {
-        LOG(logINFO) << "Copied to flash and checksum verified";
-    }
-
     LOG(logINFO) << "FPGA programmed successfully";
-    rebootController();
 }
 
 void Module::programFPGAviaNios(std::vector<char> buffer) {
@@ -3573,6 +3568,5 @@ void Module::programFPGAviaNios(std::vector<char> buffer) {
         throw RuntimeError(os.str());
     }
     LOG(logINFO) << "FPGA programmed successfully";
-    rebootController();
 }
 } // namespace sls