diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js
index 9fd791a725b..dd5d4155d4e 100644
--- a/app/controllers/events/view/sessions/list.js
+++ b/app/controllers/events/view/sessions/list.js
@@ -132,8 +132,8 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
   }
 
   @action
-  viewSession(id) {
-    this.transitionToRoute('my-sessions.view', id);
+  viewSession(session_id, event_id) {
+    this.transitionToRoute('public.sessions.view', event_id, session_id);
   }
 
   @action
diff --git a/app/controllers/my-sessions/view.js b/app/controllers/public/sessions/view.js
similarity index 100%
rename from app/controllers/my-sessions/view.js
rename to app/controllers/public/sessions/view.js
diff --git a/app/router.js b/app/router.js
index 618d9533fc9..45d4d594041 100644
--- a/app/router.js
+++ b/app/router.js
@@ -41,7 +41,8 @@ Router.map(function() {
   this.route('oauth', { path: '/oauth/callback' });
   this.route('public', { path: '/e/:event_id' }, function() {
     this.route('sessions', function() {
-      this.route('list', { path: '/s/:session_status' });
+      this.route('list', { path: '/:session_status' });
+      this.route('view', { path: '/:session_id' });
     });
     this.route('cfs', { path: '/cfs/:speaker_call_hash' }, function() {
       this.route('new-speaker');
@@ -128,7 +129,6 @@ Router.map(function() {
   });
   this.route('my-sessions', function() {
     this.route('list', { path: '/:session_status' });
-    this.route('view', { path: '/s/:session_id' });
   });
   this.route('notifications', function() {
     this.route('all', { path: '/:notification_state' });
diff --git a/app/routes/my-sessions/view.js b/app/routes/public/sessions/view.js
similarity index 100%
rename from app/routes/my-sessions/view.js
rename to app/routes/public/sessions/view.js
diff --git a/app/templates/components/session-card.hbs b/app/templates/components/session-card.hbs
index 8ed631848d8..eda2d9b79d9 100644
--- a/app/templates/components/session-card.hbs
+++ b/app/templates/components/session-card.hbs
@@ -1,13 +1,13 @@
 <div class="event wide ui grid row">
   {{#unless this.device.isMobile}}
     <div class="ui card three wide computer six wide tablet column">
-      <a class="image" href="{{href-to 'my-sessions.view' this.session.id}}">
+      <a class="image" href="{{href-to 'public.sessions.view' this.session.event.id this.session.id}}">
         <Widgets::SafeImage @src={{if this.session.event.thumbnailImageUrl this.session.event.thumbnailImageUrl "assets/images/landing.jpg"}} />
       </a>
     </div>
   {{/unless}}
   <div class="ui card thirteen wide computer ten wide tablet sixteen wide mobile column">
-    <a class="main content" href="{{href-to 'my-sessions.view' this.session.id}}">
+    <a class="main content" href="{{href-to 'public.sessions.view' this.session.event.id this.session.id}}">
       <div class="header">
         <span>{{this.session.title}}</span>
         <div class="right floated author">
diff --git a/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs b/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs
index e1793f41dca..bdc546845db 100644
--- a/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs
+++ b/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs
@@ -1,7 +1,7 @@
 {{this.record}}
 <div class="hidden ui divider"></div>
 <div class="ui horizontal compact basic buttons">
-  <UiPopup @content={{t "View Session"}} @class="ui icon button" @click={{action this.props.actions.viewSession this.extraRecords.id}} @position="left center">
+  <UiPopup @content={{t "View Session"}} @class="ui icon button" @click={{action this.props.actions.viewSession this.extraRecords.id this.extraRecords.event.id}} @position="left center">
     <i class="unhide icon"></i>		
   </UiPopup>
   {{#if (not this.extraRecords.isLocked)}}
diff --git a/app/templates/my-sessions/view.hbs b/app/templates/public/sessions/view.hbs
similarity index 100%
rename from app/templates/my-sessions/view.hbs
rename to app/templates/public/sessions/view.hbs
diff --git a/tests/integration/components/session-card-test.js b/tests/integration/components/session-card-test.js
index 441f2803aa8..d8901fe68cc 100644
--- a/tests/integration/components/session-card-test.js
+++ b/tests/integration/components/session-card-test.js
@@ -7,7 +7,7 @@ import { render } from '@ember/test-helpers';
 module('Integration | Component | session card', function(hooks) {
   setupIntegrationTest(hooks);
 
-  const session = EmberObject.create({ id: 123, title: 'Super cool JS', state: 'rejected', event: 'OS Tech', startsAt: new Date(), endsAt: new Date() });
+  const session = EmberObject.create({ id: 123, title: 'Super cool JS', state: 'rejected', event: { name: 'OS Tech', id: 123 }, startsAt: new Date(), endsAt: new Date() });
 
   test('it renders', async function(assert) {
     this.set('session', session);