diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 40123e0670..af52163ae9 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1985,7 +1985,7 @@ Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing
 			for (uint32_t i = output_start.get(*t); i < route->n_outputs().get(*t); ++i) {
 				string port;
 
-				if ((*t) == DataType::MIDI || Config->get_output_auto_connect() & AutoConnectPhysical) {
+				if ((*t) == DataType::MIDI && Config->get_output_auto_connect() & AutoConnectPhysical) {
 					port = physoutputs[(out_offset.get(*t) + i) % nphysical_out];
 				} else if ((*t) == DataType::AUDIO && Config->get_output_auto_connect() & AutoConnectMaster) {
                                         /* master bus is audio only */