diff --git a/app/controllers/public/cfs/new-session.js b/app/controllers/public/cfs/new-session.js
index d2953ffdd4a..bc432bfbe83 100644
--- a/app/controllers/public/cfs/new-session.js
+++ b/app/controllers/public/cfs/new-session.js
@@ -2,8 +2,8 @@ import Controller from '@ember/controller';
 export default Controller.extend({
   actions: {
     async save(speakerDetails) {
+      this.set('isLoading', true);
       try {
-        this.set('isLoading', true);
         await this.get('model.session').save();
         speakerDetails.sessions.pushObject(this.get('model.session'));
         await this.get('model.session').save();
@@ -12,6 +12,7 @@ export default Controller.extend({
       } catch (e) {
         this.notify.error(this.l10n.t('Oops something went wrong. Please try again'));
       }
+      this.set('isLoading', false);
     }
   }
 });
diff --git a/app/routes/public/cfs/new-session.js b/app/routes/public/cfs/new-session.js
index ef243229b7b..3891b053cc6 100644
--- a/app/routes/public/cfs/new-session.js
+++ b/app/routes/public/cfs/new-session.js
@@ -14,8 +14,10 @@ export default Route.extend({
         'page[size]' : 50
       }),
       session: await this.store.createRecord('session', {
-        event   : eventDetails,
-        creator : this.get('authManager.currentUser')
+        event       : eventDetails,
+        creator     : this.get('authManager.currentUser'),
+        track       : null,
+        sessionType : null
       }),
       speaker: await eventDetails.query('speakers', {
         filter: [
diff --git a/app/templates/components/forms/session-speaker-form.hbs b/app/templates/components/forms/session-speaker-form.hbs
index ae8f9ed97de..cbff42e2ed3 100644
--- a/app/templates/components/forms/session-speaker-form.hbs
+++ b/app/templates/components/forms/session-speaker-form.hbs
@@ -61,8 +61,8 @@
                 </div>
               {{/ui-dropdown}}
             {{else}}
-              {{#ui-dropdown class='search selection' onChange=(action (mut (get data.session field.fieldIdentifier))) as |execute mapper|}}
-                {{input type='hidden' name=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier)) value=data.session.fieldIdentifier}}
+              {{#ui-dropdown class='search selection' selected=(get data.session field.fieldIdentifier) onChange=(action (mut (get data.session field.fieldIdentifier))) as |execute mapper|}}
+                {{input type='hidden' name=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier)) value=(if (get data.session field.fieldIdentifier) (get data.session field.fieldIdentifier) null)}}
                 <i class="dropdown icon"></i>
                 <div class="default text">
                   {{if (get data.session field.fieldIdentifier) (custom-related-field data.session field.fieldIdentifier 'name') (concat 'Select a ' field.name)}}