diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 4eba830daf8c43a418168ccb5a74919d909ca6a0..7a67e3c69d714ff524bf6d0513b54a2ce645fc76 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -11,7 +11,8 @@
   <%= page_title %>
 </title>
 
-<link rel="icon" href="<%= SiteSetting['IconPath'] || '/assets/favicon.ico' %>" />
+<% icon_path = SiteSetting['IconPath'] %>
+<link rel="icon" href="<%= icon_path.present? ? icon_path : '/assets/favicon.ico' %>" />
 
 <%= stylesheet_link_tag "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css" %>
 <%= stylesheet_link_tag "https://unpkg.com/@codidact/co-design@0.12.0/dist/codidact.css" %>
diff --git a/app/views/posts/_form.html.erb b/app/views/posts/_form.html.erb
index 426dcc37acf6b175144ad01fd3b969ad51cdca6c..91758e9ce08e8a349f07ca4df125c84ed6b919a1 100644
--- a/app/views/posts/_form.html.erb
+++ b/app/views/posts/_form.html.erb
@@ -7,8 +7,8 @@
 <div class="notice is-info">
   <p><strong>Posting Tips</strong></p>
   <div class="has-font-size-caption">
-  <% guidance = @category.asking_guidance_override || SiteSetting['AskingGuidance'] %>
-    <%= raw(sanitize(render_markdown(guidance), scrubber: scrubber)) %>
+  <% guidance = @category.asking_guidance_override %>
+  <%= raw(sanitize(render_markdown(guidance.present? ? guidance : SiteSetting['AskingGuidance']), scrubber: scrubber)) %>
   </div>
 </div>