diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 4dbf9cb25fc..8f1b1d3e133 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -7,10 +7,15 @@ const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
 
 // We can add links here that have server side responses but not client side.
 const SERVER_SIDE_ONLY = [
+  /^\/assets\//,
+  /^\/uploads\//,
+  /^\/stylesheets\//,
+  /^\/site_customizations\//,
+  /^\/raw\//,
   /^\/posts\/\d+\/raw/,
   /^\/raw\/\d+/,
   /\.rss$/,
-  /\.json/,
+  /\.json$/,
 ];
 
 let _jumpScheduled = false;
@@ -122,8 +127,9 @@ const DiscourseURL = Ember.Object.extend({
       return;
     }
 
+    const pathname = path.replace(/(https?\:)?\/\/[^\/]+/, '');
     const serverSide = SERVER_SIDE_ONLY.some(r => {
-      if (path.match(r)) {
+      if (pathname.match(r)) {
         document.location = path;
         return true;
       }