diff --git a/app/models/user.rb b/app/models/user.rb
index f3acc4f0..4d7cd5ed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -107,7 +107,7 @@ def titleize_location
     end
 
     def capitalize_bio
-      return unless bio
+      return unless bio && !bio.empty?
 
       self.bio = bio[0].capitalize + bio[1..-1]
     end
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 09a59bfa..a040c702 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -32,7 +32,7 @@
         </div>
       </div>
 
-      <% if @user.location %>
+      <% if @user.location && !@user.location.empty? %>
         <div class="row">
           <div class="col-md-12 mt-4">
             <h3 class="h4 profile-heading">Location</h3>
@@ -43,7 +43,7 @@
         </div>
       <% end %>
 
-      <% if @user.bio %>
+      <% if @user.bio && !@user.bio.empty? %>
         <div class="row">
           <div class="col-md-12 mt-4">
             <h3 class="h4 profile-heading">Bio</h3>