diff --git a/cores/nRF5/HardwarePWM.cpp b/cores/nRF5/HardwarePWM.cpp
index d4d1d7715..cd8dc9dc8 100644
--- a/cores/nRF5/HardwarePWM.cpp
+++ b/cores/nRF5/HardwarePWM.cpp
@@ -205,6 +205,15 @@ bool HardwarePWM::removePin(uint8_t pin)
   return true;
 }
 
+bool HardwarePWM::removeAllPins(void)
+{
+  for(int ch=0; ch<MAX_CHANNELS; ch++)
+  {
+    _set_psel(ch, 0xFFFFFFFFUL);
+  }
+  return true;
+}
+
 bool HardwarePWM::writeChannel(uint8_t ch, uint16_t value, bool inverted)
 {
   VERIFY( ch < MAX_CHANNELS );
diff --git a/cores/nRF5/HardwarePWM.h b/cores/nRF5/HardwarePWM.h
index 2002c8a1e..dcf8fba5d 100644
--- a/cores/nRF5/HardwarePWM.h
+++ b/cores/nRF5/HardwarePWM.h
@@ -88,6 +88,9 @@ class HardwarePWM
     // Remove a pin from PWM module
     bool removePin  (uint8_t pin);
 
+    // Remove all pins from PWM module
+    bool removeAllPins (void);
+
     // Get the mapped channel of a pin
     int  pin2channel(uint8_t pin) const
     {