diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 0a958cba87..845c6da228 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -682,6 +682,7 @@ EngineControl::EngineControl ()
 			 midi_option_combo.set_sensitive (false);
 		 }
 	 }
+	 started_at_least_once = false;
 
 	 if (!ignore_changes) {
 		 maybe_display_saved_state ();
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 77d7731edf..d9e6da2e04 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -564,8 +564,9 @@ AudioEngine::drop_backend ()
 {
 	if (_backend) {
 		_backend->stop ();
-        _backend->drop_device();
+		_backend->drop_device();
 		_backend.reset ();
+		_running = false;
 	}
 }