diff --git a/src/config.h b/src/config.h
index ba88cf5f..166c4bbb 100644
--- a/src/config.h
+++ b/src/config.h
@@ -70,11 +70,11 @@ class CConfig		// Configuration for MiniDexed
 	static const unsigned MaxNotes = 8;
 	static const unsigned DefaultNotes = 8;
 #elif RASPPI == 4
-	static const unsigned MaxNotes = 24;
-	static const unsigned DefaultNotes = 16;
+	static const unsigned MaxNotes = 32;
+	static const unsigned DefaultNotes = 24;
 #elif RASPPI == 5
 	static const unsigned MaxNotes = 32;
-	static const unsigned DefaultNotes = 16;
+	static const unsigned DefaultNotes = 32;
 #else
 	static const unsigned MaxNotes = 16;
 	static const unsigned DefaultNotes = 16;
diff --git a/src/performanceconfig.cpp b/src/performanceconfig.cpp
index efbce575..d561c620 100644
--- a/src/performanceconfig.cpp
+++ b/src/performanceconfig.cpp
@@ -122,7 +122,7 @@ bool CPerformanceConfig::Load (void)
 		}
 
 		PropertyName.Format ("MIDIChannel%u", nTG+1);
-		unsigned nMIDIChannel = m_Properties.GetNumber (PropertyName, 255);
+		unsigned nMIDIChannel = m_Properties.GetNumber (PropertyName, 42);
 		if (nMIDIChannel == 0)
 		{
 			m_nMIDIChannel[nTG] = CMIDIDevice::Disabled;
@@ -132,6 +132,11 @@ bool CPerformanceConfig::Load (void)
 			m_nMIDIChannel[nTG] = nMIDIChannel-1;
 			bResult = true;
 		}
+		else if (nMIDIChannel == 42)
+		{
+			// Property didn't exist in the file, so disable this TG
+			m_nMIDIChannel[nTG] = CMIDIDevice::Disabled;
+		}
 		else
 		{
 			m_nMIDIChannel[nTG] = CMIDIDevice::OmniMode;