diff --git a/modules/juce_audio_basics/utilities/juce_ADSR.h b/modules/juce_audio_basics/utilities/juce_ADSR.h
index 2a0788b885..6de3e8dae1 100644
--- a/modules/juce_audio_basics/utilities/juce_ADSR.h
+++ b/modules/juce_audio_basics/utilities/juce_ADSR.h
@@ -113,9 +113,19 @@ public:
     /** Starts the attack phase of the envelope. */
     void noteOn()
     {
-        if      (attackRate > 0.0f)  currentState = State::attack;
-        else if (decayRate > 0.0f)   currentState = State::decay;
-        else                         currentState = State::sustain;
+        if (attackRate > 0.0f)
+        {
+            currentState = State::attack;
+        }
+        else if (decayRate > 0.0f)
+        {
+            envelopeVal = 1.0f;
+            currentState = State::decay;
+        }
+        else
+        {
+            currentState = State::sustain;
+        }
     }
 
     /** Starts the release phase of the envelope. */