diff --git a/libs/surfaces/launchpad_pro/lppro.cc b/libs/surfaces/launchpad_pro/lppro.cc
index 7505e8a1f3..3a8f577b6a 100644
--- a/libs/surfaces/launchpad_pro/lppro.cc
+++ b/libs/surfaces/launchpad_pro/lppro.cc
@@ -859,11 +859,11 @@ LaunchPadPro::connect_daw_ports ()
         auto pi = std::find_if (midi_inputs.begin(), midi_inputs.end(), is_dawport);
         auto po = std::find_if (midi_outputs.begin (), midi_outputs.end (), is_dawport);
 
-        if (!_daw_in->connected()) {
+        if (pi != midi_inputs.end() && !_daw_in->connected()) {
 	        AudioEngine::instance()->connect (_daw_in->name(), *pi);
         }
 
-        if (!_daw_out->connected()) {
+        if (po != midi_outputs.end() && !_daw_out->connected()) {
 	        AudioEngine::instance()->connect (_daw_out->name(), *po);
         }
 }