diff --git a/ember/app/components/aircraft-model-select.js b/ember/app/components/aircraft-model-select.js
index 97d777ef24..7f178909ed 100644
--- a/ember/app/components/aircraft-model-select.js
+++ b/ember/app/components/aircraft-model-select.js
@@ -11,7 +11,7 @@ export default Ember.Component.extend({
   }),
 
   model: Ember.computed('modelsWithNull.[]', 'modelId', function() {
-    return this.get('modelsWithNull').findBy('id', this.get('modelId'));
+    return this.get('modelsWithNull').findBy('id', this.get('modelId') || null);
   }),
 
   actions: {
diff --git a/ember/app/templates/flight/change-aircraft.hbs b/ember/app/templates/flight/change-aircraft.hbs
index d88dd9a108..5979629b1f 100644
--- a/ember/app/templates/flight/change-aircraft.hbs
+++ b/ember/app/templates/flight/change-aircraft.hbs
@@ -1,9 +1,9 @@
 {{#form-page title=(t "choose-aircraft")}}
   {{change-aircraft-form
     flightId=model.id
-    modelId=model.flight.model.id
-    registration=model.flight.registration
-    competitionId=model.flight.competitionId
+    modelId=(readonly model.flight.model.id)
+    registration=(readonly model.flight.registration)
+    competitionId=(readonly model.flight.competitionId)
     models=model.aircraftModels
     onDidSave=(action "transitionToFlight")}}
 {{/form-page}}
\ No newline at end of file