diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
index 6b02890..a45d3b0 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -103,10 +103,11 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
     TINY_GSM_CLIENT_CONNECT_OVERRIDES
 
     void stop(uint32_t maxWaitMs) {
+      uint32_t startMillis = millis();
       dumpModemBuffer(maxWaitMs);
       at->sendAT(GF("+QICLOSE="), mux);
       sock_connected = false;
-      at->waitResponse();
+      at->waitResponse((maxWaitMs - (millis() - startMillis)));
     }
     void stop() override {
       stop(15000L);