diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 387da9184..d92cebf15 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -133,7 +133,7 @@ class TopicLink < ActiveRecord::Base
             topic_id = nil unless topic
 
             if topic.present?
-              url = "#{Discourse.base_url}#{topic.relative_url}"
+              url = "#{Discourse.base_url_no_prefix}#{topic.relative_url}"
               url << "/#{post_number}" if post_number.to_i > 1
             end
 
@@ -168,7 +168,7 @@ class TopicLink < ActiveRecord::Base
 
             if topic && post.topic && post.topic.archetype != 'private_message' && topic.archetype != 'private_message'
 
-              prefix = Discourse.base_url
+              prefix = Discourse.base_url_no_prefix
 
               reflected_url = "#{prefix}#{post.topic.relative_url(post.post_number)}"