diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index f8d2c9500d..8879f2720a 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -32,7 +32,7 @@ CONFIG_VARIABLE (bool, send_mmc, "send-mmc", true)
 CONFIG_VARIABLE (bool, send_midi_clock, "send-midi-clock", false)
 CONFIG_VARIABLE (bool, mmc_control, "mmc-control", true)
 CONFIG_VARIABLE (bool, midi_feedback, "midi-feedback", false)
-CONFIG_VARIABLE (uint8_t, mmc_receive_device_id, "mmc-receive-device-id", 0)
+CONFIG_VARIABLE (uint8_t, mmc_receive_device_id, "mmc-receive-device-id", 0x7f)
 CONFIG_VARIABLE (uint8_t, mmc_send_device_id, "mmc-send-device-id", 0)
 CONFIG_VARIABLE (int32_t, initial_program_change, "initial-program-change", -1)
 
diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc
index 930666a027..fd18648de2 100644
--- a/libs/midi++2/mmc.cc
+++ b/libs/midi++2/mmc.cc
@@ -199,7 +199,7 @@ MachineControl::MachineControl (Manager* m, jack_client_t* jack)
 {
 	build_mmc_cmd_map ();
 
-	_receive_device_id = 0;
+	_receive_device_id = 0x7f;
 	_send_device_id = 0x7f;
 
 	_input_port = m->add_port (new Port ("MMC in", Port::IsInput, jack));