diff --git a/app/views/_tailwind/applications/index.html.erb b/app/views/_tailwind/applications/index.html.erb
index 4fd403b35..c1d044114 100644
--- a/app/views/_tailwind/applications/index.html.erb
+++ b/app/views/_tailwind/applications/index.html.erb
@@ -9,5 +9,5 @@
   <%= render partial: "application", collection: @applications %>
 </div>
 
-<%# TODO: Speed up controller by using without_count %>
+<%# TODO: Speed up controller by using without_count after removing old theme %>
 <%= render Tailwind::SimplePager.new(collection: @applications) %>
diff --git a/app/views/_tailwind/comments/index.html.erb b/app/views/_tailwind/comments/index.html.erb
index 18ae916cf..305ee1416 100644
--- a/app/views/_tailwind/comments/index.html.erb
+++ b/app/views/_tailwind/comments/index.html.erb
@@ -9,5 +9,5 @@
   <%= render @comments, show_extra: true %>
 </div>
 
-<%# TODO: Speed up controller by using without_count %>
+<%# TODO: Speed up controller by using without_count after removing old theme %>
 <%= render Tailwind::SimplePager.new(collection: @comments) %>