diff --git a/targets/TARGET_Maxim/TARGET_MAX32660/Libraries/PeriphDrivers/Source/SPI/spi_reva.c b/targets/TARGET_Maxim/TARGET_MAX32660/Libraries/PeriphDrivers/Source/SPI/spi_reva.c
index 82a54ee244..05d6ad32a9 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32660/Libraries/PeriphDrivers/Source/SPI/spi_reva.c
+++ b/targets/TARGET_Maxim/TARGET_MAX32660/Libraries/PeriphDrivers/Source/SPI/spi_reva.c
@@ -764,7 +764,7 @@ int MXC_SPI_RevA_TransSetup(mxc_spi_reva_req_t *req)
     states[spi_num].started = 0;
     states[spi_num].req_done = 0;
     // HW requires disabling/renabling SPI block at end of each transaction (when SS is inactive).
-    if (states[spi_num].ssDeassert == 1) {
+    if (states[spi_num].drv_ssel && (states[spi_num].ssDeassert == 1)) {
         (req->spi)->ctrl0 &= ~(MXC_F_SPI_REVA_CTRL0_EN);
     }
 
diff --git a/targets/TARGET_Maxim/TARGET_MAX32670/Libraries/PeriphDrivers/Source/SPI/spi_reva.c b/targets/TARGET_Maxim/TARGET_MAX32670/Libraries/PeriphDrivers/Source/SPI/spi_reva.c
index 2726ede611..9b201d5e32 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32670/Libraries/PeriphDrivers/Source/SPI/spi_reva.c
+++ b/targets/TARGET_Maxim/TARGET_MAX32670/Libraries/PeriphDrivers/Source/SPI/spi_reva.c
@@ -764,7 +764,7 @@ int MXC_SPI_RevA_TransSetup(mxc_spi_reva_req_t *req)
     states[spi_num].started = 0;
     states[spi_num].req_done = 0;
     // HW requires disabling/renabling SPI block at end of each transaction (when SS is inactive).
-    if (states[spi_num].ssDeassert == 1) {
+    if (states[spi_num].drv_ssel && (states[spi_num].ssDeassert == 1) ) {
         (req->spi)->ctrl0 &= ~(MXC_F_SPI_REVA_CTRL0_EN);
     }