diff --git a/app/appointments/edit/controller.js b/app/appointments/edit/controller.js
index d4e7357aae..04add51753 100644
--- a/app/appointments/edit/controller.js
+++ b/app/appointments/edit/controller.js
@@ -57,7 +57,7 @@ export default AbstractEditController.extend(AppointmentStatuses, PatientSubmodu
         isAdmissionAppointment = this.get('isAdmissionAppointment');
     return (!allDay && isAdmissionAppointment);
   }.property('model.allDay', 'isAdmissionAppointment'),
-  visitTypesList: Ember.computed.alias('appointmentsController.visitTypeList'),
+  visitTypesList: Ember.computed.alias('appointmentsController.visitTypesList'),
 
   cancelAction: function() {
     var returnTo = this.get('model.returnTo');
diff --git a/app/appointments/search/controller.js b/app/appointments/search/controller.js
index 6157d75eb1..887da0ad06 100644
--- a/app/appointments/search/controller.js
+++ b/app/appointments/search/controller.js
@@ -19,7 +19,7 @@ export default AppointmentIndexController.extend(AppointmentStatuses, VisitTypes
   startDate: null,
   startKey: [],
   status: null,
-  visitTypesList: Ember.computed.alias('appointmentsController.visitTypeList'),
+  visitTypesList: Ember.computed.alias('appointmentsController.visitTypesList'),
 
   actions: {
     search: function() {
diff --git a/app/mixins/visit-types.js b/app/mixins/visit-types.js
index 69690a40a4..42e1c24583 100644
--- a/app/mixins/visit-types.js
+++ b/app/mixins/visit-types.js
@@ -25,9 +25,9 @@ export default Ember.Mixin.create({
 
   visitTypes: function() {
     return this._getVisitTypes();
-  }.property('visitTypesList', 'defaultVisitTypes'),
+  }.property('visitTypesList', 'defaultVisitTypes').volatile(),
 
   visitTypesWithEmpty: function() {
     return this._getVisitTypes(true);
-  }.property('visitTypesList', 'defaultVisitTypes')
+  }.property('visitTypesList', 'defaultVisitTypes').volatile()
 });
diff --git a/app/patients/reports/controller.js b/app/patients/reports/controller.js
index 87721704fc..cef7d922f4 100644
--- a/app/patients/reports/controller.js
+++ b/app/patients/reports/controller.js
@@ -13,7 +13,7 @@ export default AbstractReportController.extend(PatientDiagnosis, PatientVisits,
   physicianList: Ember.computed.map('patientsController.physicianList.value', SelectValues.selectValuesMap),
   locationList: Ember.computed.map('patientsController.locationList.value', SelectValues.selectValuesMap),
   statusList: Ember.computed.map('patientsController.statusList.value', SelectValues.selectValuesMap),
-  visitTypesList: Ember.computed.alias('patientsController.visitTypeList'),
+  visitTypesList: Ember.computed.alias('patientsController.visitTypesList'),
   reportType: 'detailedAdmissions',
   patientDetails: {},
 
diff --git a/app/visits/edit/controller.js b/app/visits/edit/controller.js
index dc9281cd86..6c47d02cb3 100644
--- a/app/visits/edit/controller.js
+++ b/app/visits/edit/controller.js
@@ -101,7 +101,7 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, Pa
   pricingTypes: Ember.computed.alias('visitsController.wardPricingTypes'),
   physicianList: Ember.computed.alias('visitsController.physicianList'),
   locationList: Ember.computed.alias('visitsController.locationList'),
-  visitTypesList: Ember.computed.alias('visitsController.visitTypeList'),
+  visitTypesList: Ember.computed.alias('visitsController.visitTypesList'),
   lookupListsToUpdate: [{
     name: 'diagnosisList',
     property: 'model.primaryBillingDiagnosis',