diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js
index 681085fbb7d..bf5b8f1b6b0 100644
--- a/app/assets/javascripts/discourse/lib/url.js
+++ b/app/assets/javascripts/discourse/lib/url.js
@@ -99,7 +99,7 @@ Discourse.URL = Em.Object.createWithMixins({
     if (url && url.length) {
       if (url.indexOf('/') === 0) { return true; }
       if (url.indexOf(this.origin()) === 0) { return true; }
-      if (url.replace(/^http[^s]/, 'https').indexOf(this.origin()) === 0) { return true; }
+      if (url.replace(/^http/, 'https').indexOf(this.origin()) === 0) { return true; }
       if (url.replace(/^https/, 'http').indexOf(this.origin()) === 0) { return true; }
     }
     return false;
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 5b08475478d..0719876f202 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -15,7 +15,7 @@ class TopicLinkClick < ActiveRecord::Base
     
     if args[:url] =~ /^http/
       http_url = args[:url].sub(/^https/, 'http')
-      https_url = args[:url].sub(/^http[^s]/, 'https')
+      https_url = args[:url].sub(/^http/, 'https')
       link = TopicLink.select([:id, :user_id]).where('url = ? OR url = ?', http_url, https_url)
     else
       link = TopicLink.select([:id, :user_id]).where(url: args[:url])