diff --git a/logical/qspi_controller/logical/qspi_controller.sv b/logical/qspi_controller/logical/qspi_controller.sv
index ae4ef8a78091b877e401cbe47e25cff9cc6b861a..8b3fded10cb602ba03a0a30c98bfc126249a36ea 100644
--- a/logical/qspi_controller/logical/qspi_controller.sv
+++ b/logical/qspi_controller/logical/qspi_controller.sv
@@ -153,7 +153,7 @@ always @(*) begin
                 else
                     next_state = IDLE;
             end 
-            else if(QSPI_QIO_MODE==1'b0 & addr_counter==5'h21) begin
+            else if(QSPI_QIO_MODE==1'b0 & addr_counter==5'h15) begin
                 QSPI_ENABLE_ACK = 1'b0;
                 if(QSPI_DUMMY_CYCLES>4'h0)
                     next_state = DUMMY;
diff --git a/logical/top_ahb_qspi/logical/top_ahb_qspi.v b/logical/top_ahb_qspi/logical/top_ahb_qspi.v
index f4dae70a2be81f6b63285160f7a07c375b01a920..ab151f60dd9716146384cd61e25d75e43f81b349 100644
--- a/logical/top_ahb_qspi/logical/top_ahb_qspi.v
+++ b/logical/top_ahb_qspi/logical/top_ahb_qspi.v
@@ -122,6 +122,66 @@ cmsdk_apb_slave_mux #(
     .PRDATA1           (cache_prdata),
     .PSLVERR1          (cache_pslverr),
 
+    .PSEL2(),
+    .PSEL3(),
+    .PSEL4(),
+    .PSEL5(),
+    .PSEL6(),
+    .PSEL7(),
+    .PSEL8(),
+    .PSEL9(),
+    .PSEL10(),
+    .PSEL11(),
+    .PSEL12(),
+    .PSEL13(),
+    .PSEL14(),
+    .PSEL15(),
+
+    .PREADY2(1'b1),
+    .PREADY3(1'b1),
+    .PREADY4(1'b1),
+    .PREADY5(1'b1),
+    .PREADY6(1'b1),
+    .PREADY7(1'b1),
+    .PREADY8(1'b1),
+    .PREADY9(1'b1),
+    .PREADY10(1'b1),
+    .PREADY11(1'b1),
+    .PREADY12(1'b1),
+    .PREADY13(1'b1),
+    .PREADY14(1'b1),
+    .PREADY15(1'b1),
+
+    .PSLVERR2(1'b1),
+    .PSLVERR3(1'b1),
+    .PSLVERR4(1'b1),
+    .PSLVERR5(1'b1),
+    .PSLVERR6(1'b1),
+    .PSLVERR7(1'b1),
+    .PSLVERR8(1'b1),
+    .PSLVERR9(1'b1),
+    .PSLVERR10(1'b1),
+    .PSLVERR11(1'b1),
+    .PSLVERR12(1'b1),
+    .PSLVERR13(1'b1),
+    .PSLVERR14(1'b1),
+    .PSLVERR15(1'b1),
+
+    .PRDATA2(32'hDEADCAFE),
+    .PRDATA3(32'hDEADCAFE),
+    .PRDATA4(32'hDEADCAFE),
+    .PRDATA5(32'hDEADCAFE),
+    .PRDATA6(32'hDEADCAFE),
+    .PRDATA7(32'hDEADCAFE),
+    .PRDATA8(32'hDEADCAFE),
+    .PRDATA9(32'hDEADCAFE),
+    .PRDATA10(32'hDEADCAFE),
+    .PRDATA11(32'hDEADCAFE),
+    .PRDATA12(32'hDEADCAFE),
+    .PRDATA13(32'hDEADCAFE),
+    .PRDATA14(32'hDEADCAFE),
+    .PRDATA15(32'hDEADCAFE),
+
     // Output
     .PREADY            (PREADY),
     .PRDATA            (PRDATA),