diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 1389e815ef..b883bc352e 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -3098,7 +3098,9 @@ EngineControl::device_list_changed ()
 		return;
 	}
 	PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1); // ??
-	list_devices ();
+	if (!ARDOUR::AudioEngine::instance()->running()) {
+		list_devices ();
+	}
 	midi_option_changed();
 }