diff --git a/models/site.rb b/models/site.rb
index a3a7870b..5a5d9268 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -830,12 +830,10 @@ class Site < Sequel::Model
     ((total_used_space.to_f / maximum_space) * 100).round(1)
   end
 
-  # This returns true even if they end their support plan.
   def supporter?
-    !owner.values[:stripe_customer_id].nil?
+    plan_type != 'free'
   end
 
-  # This will return false if they have ended their plan.
   def ended_supporter?
     owner.values[:plan_ended]
   end
diff --git a/views/_news.erb b/views/_news.erb
index 90f781de..ab64dbb9 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -24,7 +24,7 @@
       <% if current_site && current_site.id == actioning_site.id %>
         <a href="/site/<%= current_site.username %>" class="you">You</a>
       <% else %>
-        <a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
+        <a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><i class="fa fa-user"><% if actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
       <% end %>
 
       followed
@@ -32,7 +32,7 @@
       <% if current_site && event_site.id == current_site.id %>
         <a href="/site/<%= current_site.username %>" class="you">you</a>
       <% else %>
-        <a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><i class="fa fa-user"><% if event_site.supporter? && !event_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= event_site.username %></a>
+        <a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><i class="fa fa-user"><% if event_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= event_site.username %></a>
       <% end %>
 
       <span class="date">
@@ -91,7 +91,7 @@
           <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
           <div class="comment" id="comment_<%= comment.id %>">
             <img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '50x50') %>">
-            <a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><i class="fa fa-user"><% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= comment_actioning_site.username %></a>
+            <a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><i class="fa fa-user"><% if comment_actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= comment_actioning_site.username %></a>
             <span class="date">
               <a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
             </span>
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index 14516743..33040be9 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -7,7 +7,7 @@
   <% if current_site && current_site.id == actioning_site.id %>
     <a href="/site/<%= current_site.username %>" class="you">You</a>
   <% else %>
-    <a href="/site/<%= actioning_site.username %>" class="user"><i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
+    <a href="/site/<%= actioning_site.username %>" class="user"><i class="fa fa-user"><% if actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
   <% end %>
 
   <i class="fa fa-chevron-right comment-symbol" title="commented on"></i>
@@ -15,7 +15,7 @@
     <% if current_site && current_site.id == profile_comment.site_id %>
       <a href="/site/<%= current_site.username %>" class="you">You</a>
     <% else %>
-      <a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a>
+      <a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a>
     <% end %>
   <span class="date">
     <a href="?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>
diff --git a/views/browse.erb b/views/browse.erb
index e64d7114..2061152b 100644
--- a/views/browse.erb
+++ b/views/browse.erb
@@ -74,7 +74,7 @@
         <div class="site-info">
           <div class="username">
             <a href="/site/<%= site.username %>" title="Profile">
-              <i class="fa fa-user"><% if site.supporter? && !site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= site.username %>
+              <i class="fa fa-user"><% if site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= site.username %>
             </a>
           </div>
           <div class="site-stats">
diff --git a/views/site.erb b/views/site.erb
index 03c18a72..47ff9f98 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -19,7 +19,7 @@
       </div>
     </div>
     <div class="col col-50">
-      <h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? && !site.ended_supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
+      <h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
       <p class="site-url"><a href="/surf/<%= site.username %>"><%= site.host %></a></p>
       <div class="stats">
         <div class="stat"><strong><%= site.views_english %></strong> <span>views</span></div>
diff --git a/views/surf.erb b/views/surf.erb
index ee05b7a0..a06e5e23 100644
--- a/views/surf.erb
+++ b/views/surf.erb
@@ -177,7 +177,7 @@
       <% end %>
     </ul>
     <ul class="site-actions">
-      <li><a href="/site/<%= @site.username %>"><i class="fa fa-user"><% if @site.supporter? && !@site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i> <strong><%= @site.username %></strong></a></li>
+      <li><a href="/site/<%= @site.username %>"><i class="fa fa-user"><% if @site.supporter? %><i class="fa fa-heart"></i><% end %></i> <strong><%= @site.username %></strong></a></li>
 
       <% if current_site && current_site != @site %>
         <li>