diff --git a/MicroDexed.ino b/MicroDexed.ino
index 77a95f0..b86c140 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -505,7 +505,7 @@ void loop()
           lcd.setCursor(14 + instance_id, 1);
           lcd.write(6 + instance_id);
         }
-        else if (midi_voices[instance_id] == 0 && midi_decay[instance_id] == 0)
+        else if (midi_voices[instance_id] == 0 && midi_decay[instance_id] == 0 && !MicroDexed[instance_id]->getSustain())
         {
           midi_decay[instance_id]--;
           lcd.setCursor(14 + instance_id, 1);
@@ -519,7 +519,7 @@ void loop()
           lcd.setCursor(14 + instance_id, 1);
           lcd.write(6 + instance_id);
         }
-        else if (midi_voices[instance_id] == 0)
+        else if (midi_voices[instance_id] == 0 && !MicroDexed[instance_id]->getSustain())
         {
           midi_playing[instance_id] = false;
           lcd.setCursor(14 + instance_id, 1);
diff --git a/config.h b/config.h
index 1ed854a..006a9c7 100644
--- a/config.h
+++ b/config.h
@@ -273,9 +273,9 @@
 #define MIDI_DEVICE_USB_HOST 1
 #if defined(USE_FX)
 #if NUM_DEXED == 1
-#define MAX_NOTES 13
+#define MAX_NOTES 12
 #else
-#define MAX_NOTES 10
+#define MAX_NOTES 9
 #endif
 #else
 #if NUM_DEXED == 1