diff --git a/.erb-lint.yml b/.erb-lint.yml
index d0ccb0c0d..3cca0301c 100644
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -25,8 +25,6 @@ linters:
         Enabled: false
       Rails/OutputSafety:
         Enabled: false
-      Rails/DynamicFindBy:
-        Enabled: false # TODO
       Layout/LeadingBlankLines:
         Enabled: false # TODO
 exclude:
diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 745fb2012..3ebcf7fab 100644
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag "edit/potlatch" %>
 
 <div id="map">
-  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by_token(session[:token]) -%>
+  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%>
   <% data = { :token => session[:token] } -%>
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>
diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index bb6d3f81e..11519c26e 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1,7 +1,7 @@
 <%= javascript_include_tag "edit/potlatch2" %>
 
 <div id="map">
-  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by_token(session[:token]) -%>
+  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%>
   <% data = { :token => session[:token] } -%>
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>