diff --git a/bsp_q7s/callbacks/rwSpiCallback.cpp b/bsp_q7s/callbacks/rwSpiCallback.cpp
index 73516fb4..ca214f77 100644
--- a/bsp_q7s/callbacks/rwSpiCallback.cpp
+++ b/bsp_q7s/callbacks/rwSpiCallback.cpp
@@ -188,7 +188,6 @@ ReturnValue_t spiCallback(SpiComIF* comIf, SpiCookie *cookie, const uint8_t *sen
         else {
             *(rxBuf + decodedFrameLen) = byteRead;
             decodedFrameLen++;
-            continue;
         }
 
         /**
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 66357373..a86f072b 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -856,7 +856,6 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {
     rwHandler1->setStartUpImmediately();
 #endif
     rw1SpiCookie->setCallbackArgs(rwHandler1);
-    rwHandler1->setStartUpImmediately();
 
     auto rwHandler2 = new RwHandler(objects::RW2, objects::SPI_COM_IF, rw2SpiCookie, gpioComIF,
             gpioIds::EN_RW2);