diff --git a/app/views/experts/_expert_show.html.erb b/app/views/experts/_expert_show.html.erb
index ba66bfc..b4cf1a7 100644
--- a/app/views/experts/_expert_show.html.erb
+++ b/app/views/experts/_expert_show.html.erb
@@ -1,6 +1,8 @@
 <div class="row">
   <div class="col-md-12">
-    <%= image_tag expert.avatar, height: 150 %>
+    <% if expert.avatar.attached? %>
+      <%= image_tag expert.avatar, height: 150 %>
+    <% end %>
   </div>
 </div>
 <div class="row">
diff --git a/app/views/experts/_expert_show.pdf.erb b/app/views/experts/_expert_show.pdf.erb
index 7bb0e42..268a33f 100644
--- a/app/views/experts/_expert_show.pdf.erb
+++ b/app/views/experts/_expert_show.pdf.erb
@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-12">
-    <% unless expert.avatar.blank? %>
+    <% if expert.avatar.attached? %>
     <% b64 = open(ActiveStorage::Blob.service.path_for(expert.avatar.key)) { |f| f.read }  %>
     <% b64a = Base64.strict_encode64(b64) %>
       <img src="data:image/jpeg;base64,<%= b64a %>" height="150px"/>
diff --git a/app/views/experts/_list.html.erb b/app/views/experts/_list.html.erb
index 4c94f92..6c3d63d 100644
--- a/app/views/experts/_list.html.erb
+++ b/app/views/experts/_list.html.erb
@@ -18,7 +18,11 @@
   <tbody>
     <% @experts.each do |expert| %>
       <tr>
-        <td><%= image_tag expert.avatar, height: 20 %></td>
+        <td>
+          <% if expert.avatar.attached? %>
+          <%= image_tag expert.avatar, height: 20 %>
+          <% end %>
+        </td>
         <td><%= link_to expert.name, expert %></td>
         <td><%= expert.description %></td>
         <td>
diff --git a/app/views/partners/_list.html.erb b/app/views/partners/_list.html.erb
index 22392d5..6705f5e 100644
--- a/app/views/partners/_list.html.erb
+++ b/app/views/partners/_list.html.erb
@@ -18,7 +18,11 @@
   <tbody>
     <% @partners.each do |partner| %>
       <tr>
-        <td><%= image_tag partner.logo, height: 20 %></td>
+        <td>
+          <% if partner.logo.attached? %>
+          <%= image_tag partner.logo, height: 20 %>
+          <% end %>
+        </td>
         <td><%= link_to partner.name, partner %></td>
         <td><%= partner.description %></td>
         <td>
diff --git a/app/views/partners/_partner_show.html.erb b/app/views/partners/_partner_show.html.erb
index dd91044..23a70db 100644
--- a/app/views/partners/_partner_show.html.erb
+++ b/app/views/partners/_partner_show.html.erb
@@ -4,7 +4,9 @@
         <td>
           <div class="row">
             <div class="col-md-12">
+              <% if partner.logo.attached? %>
               <%= image_tag partner.logo, height: 40 %>
+              <% end %>
             </div>
           </div>
           <div class="row">
diff --git a/app/views/partners/_partner_show.pdf.erb b/app/views/partners/_partner_show.pdf.erb
index fbfce87..3e3a3e9 100644
--- a/app/views/partners/_partner_show.pdf.erb
+++ b/app/views/partners/_partner_show.pdf.erb
@@ -4,7 +4,7 @@
         <td>
           <div class="row">
             <div class="col-md-12">
-              <% unless partner.logo.blank? %>
+              <% if partner.logo.attached? %>
               <% b64 = open(ActiveStorage::Blob.service.path_for(partner.logo.key)) { |f| f.read }  %>
               <% b64a = Base64.strict_encode64(b64) %>
               <img src="data:image/jpeg;base64,<%= b64a %>" height="40px"/>