diff --git a/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp b/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
index 605c78840..ac9e30b8f 100644
--- a/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
+++ b/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
@@ -418,7 +418,7 @@ void SoftwareSerial::begin(long speed)
 
 void SoftwareSerial::end()
 {
-  if (digitalPinToPCMSK(_receivePin))
+  if (_rx_delay_stopbit)
     *digitalPinToPCMSK(_receivePin) &= ~_BV(digitalPinToPCMSKbit(_receivePin));
 }