diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp
index 04c049e6fe..54d8856c8f 100644
--- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp
+++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp
@@ -19,6 +19,8 @@
 #include "APN_db.h"
 #include "CellularLog.h"
 
+#include "rtos/ThisThread.h"
+
 namespace mbed {
 
 UBLOX_AT_CellularContext::UBLOX_AT_CellularContext(ATHandler &at, CellularDevice *device, const char *apn, bool cp_req, bool nonip_req) :
@@ -206,7 +208,7 @@ bool UBLOX_AT_CellularContext::activate_profile(const char *apn,
                     if (activated) {  //If context is activated, exit while loop and return status
                         break;
                     }
-                    wait_ms(5000);    //Wait for 5 seconds and then try again
+                    rtos::ThisThread::sleep_for(5000);    //Wait for 5 seconds and then try again
                 }
                 t1.stop();
             }
diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp
index 18ddee7f73..77851dbd37 100644
--- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp
+++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp
@@ -17,6 +17,8 @@
 
 #include "UBLOX_AT_CellularNetwork.h"
 
+#include "rtos/ThisThread.h"
+
 using namespace mbed;
 
 UBLOX_AT_CellularNetwork::UBLOX_AT_CellularNetwork(ATHandler &atHandler) : AT_CellularNetwork(atHandler)
@@ -93,7 +95,7 @@ nsapi_error_t UBLOX_AT_CellularNetwork::ubx_reboot()
         } else {
             //Don't clear err here so that we get some error in case of failure
             _at.clear_error();
-            wait_ms(1000);
+            rtos::ThisThread::sleep_for(1000);
         }
     }
     t1.stop();