diff --git a/lib/jam_ruby/connection_manager.rb b/lib/jam_ruby/connection_manager.rb
index c6b10f19b..9709837d6 100644
--- a/lib/jam_ruby/connection_manager.rb
+++ b/lib/jam_ruby/connection_manager.rb
@@ -278,7 +278,7 @@ SQL
 
     # if a blk is passed in, upon success, it will be called and you can issue notifications
     # within the connection table lock
-      def join_music_session(user, client_id, music_session, as_musician, tracks, &blk)
+    def join_music_session(user, client_id, music_session, as_musician, tracks, &blk)
       connection = nil
       user_id = user.id
       music_session_id = music_session.id
diff --git a/lib/jam_ruby/models/track.rb b/lib/jam_ruby/models/track.rb
index d39323bdc..7ae02b24c 100644
--- a/lib/jam_ruby/models/track.rb
+++ b/lib/jam_ruby/models/track.rb
@@ -5,6 +5,8 @@ module JamRuby
 
     self.primary_key = 'id'
 
+    default_scope order('created_at ASC')
+
     SOUND = %w(mono stereo)
   
     belongs_to :connection, :class_name => "JamRuby::Connection", :inverse_of => :tracks