diff --git a/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee
index 43a8ab69b..5b0b4b13a 100644
--- a/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee
@@ -50,9 +50,9 @@ MIX_MODES = context.JK.MIX_MODES
           if track.part != ''
             track.instrument_desc += ' (' + track.part + ')'
 
-      trackRow.free_state = if context.JK.currentUserFreeJamTrack then 'free' else 'non-free'
+      trackRow.free_state = if @state.is_free then 'free' else 'non-free'
 
-      trackRow.is_free = trackRow.free_state == 'free'
+      trackRow.is_free = @state.is_free
 
       uiJamTracks.push trackRow
 
@@ -160,13 +160,13 @@ MIX_MODES = context.JK.MIX_MODES
 
 
   getInitialState: () ->
-    {search: '', type: 'user-input', jamtracks:[], show_all_artists: false, currentPage: 0, next: null, searching: false, count: 0}
+    {search: '', type: 'user-input', jamtracks:[], show_all_artists: false, currentPage: 0, next: null, searching: false, count: 0, is_free: context.JK.currentUserFreeJamTrack}
 
 
   clearResults:() ->
     #@content.empty()
     #@noMoreJamtracks.hide()
-    @setState({currentPage: 0, next: null, jamtracks:[], type: 'user-input', searching:false})
+    @setState({currentPage: 0, next: null, jamtracks:[], type: 'user-input', searching:false, is_free: context.JK.currentUserFreeJamTrack})
 
 
   defaultQuery:(extra) ->
@@ -358,6 +358,7 @@ MIX_MODES = context.JK.MIX_MODES
     @setFilterFromURL()
 
   beforeShow: () ->
+    @setState({is_free: context.JK.currentUserFreeJamTrack})
 
   setFilterFromURL:()  ->
 
diff --git a/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
index e3503d769..bf402a62b 100644
--- a/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
@@ -51,7 +51,7 @@ MIX_MODES = context.JK.MIX_MODES
 
       trackRow.free_state = if @state.is_free then 'free' else 'non-free'
 
-      trackRow.is_free = @state.is_free == 'free'
+      trackRow.is_free = @state.is_free
 
       uiJamTracks.push trackRow
 
@@ -504,8 +504,8 @@ MIX_MODES = context.JK.MIX_MODES
 
 
   beforeShow: () ->
+    @setState({is_free: context.JK.currentUserFreeJamTrack})
     if !@state.first_search
-      @setState({is_free: context.JK.currentUserFreeJamTrack})
       @search(@state.type, window.JamTrackSearchInput)
 
 
diff --git a/web/app/assets/stylesheets/client/jamtrack_landing.css.scss b/web/app/assets/stylesheets/client/jamtrack_landing.css.scss
index 33fcb6a7c..37a0a3049 100644
--- a/web/app/assets/stylesheets/client/jamtrack_landing.css.scss
+++ b/web/app/assets/stylesheets/client/jamtrack_landing.css.scss
@@ -89,16 +89,6 @@
       margin-bottom: 10px !important;
     }
 
-    .free-jamtrack {
-      font-size: 11pt;
-      padding: 3px;
-      @include border-radius(7px);
-      background-color:$ColorScreenPrimary;
-      color: white !important;
-      text-align: center;
-      vertical-align: center;
-    }
-
     .what, .howto {
       margin-bottom: 2em;
       font-size: 14px;