diff --git a/app/assets/stylesheets/osem-schedule.css.scss b/app/assets/stylesheets/osem-schedule.css.scss
index 61959a67..587cde8d 100644
--- a/app/assets/stylesheets/osem-schedule.css.scss
+++ b/app/assets/stylesheets/osem-schedule.css.scss
@@ -171,6 +171,9 @@ td.no-padding{
   margin-top: 20px;
 }
 
+.unscheduled-event{
+  margin-top: 8px;
+}
 
 .all-speaker-pic{
   padding: 20px 10px 20px 10px;
diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb
index b2f1670f..f5e72483 100644
--- a/app/controllers/conference_controller.rb
+++ b/app/controllers/conference_controller.rb
@@ -22,6 +22,7 @@ class ConferenceController < ApplicationController
     @conf_period = conf_end - @conf_start
 
     @scheduled_events = @conference.program.events.scheduled
+    @unscheduled_events = @conference.program.events.unscheduled
 
     if @dates == Date.current
       @today = Date.current.strftime('%Y-%m-%d')
diff --git a/app/models/program.rb b/app/models/program.rb
index 246084a4..be8f56a9 100644
--- a/app/models/program.rb
+++ b/app/models/program.rb
@@ -30,6 +30,10 @@ class Program < ActiveRecord::Base
       where.not(start_time: nil).where.not(room: nil).order(start_time: :asc)
     end
 
+    def unscheduled
+      confirmed.where('start_time IS NULL OR room_id IS NULL')
+    end
+
     def highlights
       where(state: :confirmed, is_highlight: true)
     end
diff --git a/app/views/conference/_all_events.html.erb b/app/views/conference/_all_events.html.erb
index deb7c7a7..6d7ac5e1 100644
--- a/app/views/conference/_all_events.html.erb
+++ b/app/views/conference/_all_events.html.erb
@@ -1,5 +1,7 @@
 <h1 class="text-center">Program for <%= @conference.title %></h1>
 <div class="row">
+
+  <!-- scheduled events -->
   <% date = nil %>
   <% time = nil %>
   <% @scheduled_events.each do |event| %>
@@ -26,4 +28,21 @@
       </div>
     <% end %>
   <% end %>
+
+  <!-- confirmed events that are not scheduled -->
+  <% if @unscheduled_events.any? %>
+  <div class='col-xs-12 col-md-12 all-events-title'>
+    <span class='date-title' id='program-unscheduled'>
+      Unscheduled events
+    </span>
+    <a title="Go up" class="pull-right" href="#program">
+      <i class="fa fa-angle-double-up fa-lg" aria-hidden="true"></i>
+    </a>
+  </div>
+  <% end %>
+  <% @unscheduled_events.each do |event| %>
+    <div class='col-xs-12 col-md-12 unscheduled-event'>
+      <%= render partial: 'event', locals: {event: event} %>
+    </div>
+  <% end %>
 </div>