diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.h b/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.h
index c035ba755e..c27f7bd076 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.h
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.h
@@ -24,6 +24,7 @@
 #ifndef HAL_SERVO_STM32F1_H
 #define HAL_SERVO_STM32F1_H
 
+// Path needed, otherwise HAL version is used
 #include <../../libraries/Servo/src/Servo.h>
 
 // Inherit and expand on the official library
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.cpp
index 6a5e40127c..ff56036ccd 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.cpp
@@ -6,13 +6,17 @@
 
 #include "HAL_Servo_Teensy.h"
 
+uint8_t servoPin[MAX_SERVOS] = { 0 };
+
 int8_t libServo::attach(const int pin) {
   if (this->servoIndex >= MAX_SERVOS) return -1;
-  return Servo::attach(pin);
+  if (pin > 0) servoPin[this->servoIndex] = pin;
+  return Servo::attach(servoPin[this->servoIndex]);
 }
 
 int8_t libServo::attach(const int pin, const int min, const int max) {
-  return Servo::attach(pin, min, max);
+  if (pin > 0) servoPin[this->servoIndex] = pin;
+  return Servo::attach(servoPin[this->servoIndex], min, max);
 }
 
 void libServo::move(const int value) {
diff --git a/Marlin/src/HAL/servo.cpp b/Marlin/src/HAL/servo.cpp
index 1c3c003d82..6bafb26dc4 100644
--- a/Marlin/src/HAL/servo.cpp
+++ b/Marlin/src/HAL/servo.cpp
@@ -51,7 +51,6 @@
  *
  */
 
-
 #include "../inc/MarlinConfig.h"
 
 #if HAS_SERVOS && !(IS_32BIT_TEENSY || defined(TARGET_LPC1768) || defined(STM32F4))