diff --git a/ruby/spec/jam_ruby/models/music_session_spec.rb b/ruby/spec/jam_ruby/models/music_session_spec.rb
index 4d64f12a8..46d182a71 100644
--- a/ruby/spec/jam_ruby/models/music_session_spec.rb
+++ b/ruby/spec/jam_ruby/models/music_session_spec.rb
@@ -330,11 +330,10 @@ describe MusicSession do
 
       # scores!
 
-      ActiveRecord::Base.logger = Logger.new(STDOUT)
+      #ActiveRecord::Base.logger = Logger.new(STDOUT)
       music_sessions = MusicSession.nindex(user, client_id: c3.client_id).take(100)
       #music_sessions = MusicSession.index(user).take(100)
-      ActiveRecord::Base.logger = nil
-      puts(music_sessions.inspect)
+      #ActiveRecord::Base.logger = nil
 
       music_sessions.length.should == 2
       music_sessions[0].id.should == later_session.id
diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
index 025136df1..150f81386 100644
--- a/web/app/assets/javascripts/session.js
+++ b/web/app/assets/javascripts/session.js
@@ -275,7 +275,7 @@
 
         function afterShow(data) {
 
-            if (!(context.JK.hasOneConfiguredDevice())) {
+            if (!context.JK.hasOneConfiguredDevice() || context.JK.TrackHelpers.getUserTracks(context.jamClient).length == 0) {
               app.afterFtue = function() { initializeSession(); };
               app.cancelFtue = function() { promptLeave = false; window.location = '/client#/home' };
               app.layout.startNewFtue();
diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js
index 9c34430a5..d982f9dd5 100644
--- a/web/app/assets/javascripts/sessionList.js
+++ b/web/app/assets/javascripts/sessionList.js
@@ -141,13 +141,14 @@
 
         $('.join-link', $parentRow).click(function(evt) {
             // If no FTUE, show that first.
-          if (!(context.JK.hasOneConfiguredDevice())) {
+          if (!context.JK.hasOneConfiguredDevice() || context.JK.TrackHelpers.getUserTracks(context.jamClient).length == 0) {
                 app.afterFtue = function() { joinClick(session.id); };
                 app.layout.startNewFtue();
-                return;
             } else {
                 joinClick(session.id);
             }
+
+            return false;
         });
     }