diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e1c35eee5..a0ff6f621 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -53,6 +53,8 @@ module ApplicationHelper
 
     if image
       polymorphic_path(image)
+    elsif AssetFinder.find_asset(File.join(Tenant.subfolder_path, filename))
+      File.join(Tenant.subfolder_path, filename)
     else
       filename
     end