diff --git a/client/my-sites/themes/index.node.js b/client/my-sites/themes/index.node.js
index <HASH>..<HASH> 100644
--- a/client/my-sites/themes/index.node.js
+++ b/client/my-sites/themes/index.node.js
@@ -38,7 +38,10 @@ export default function( router ) {
 			'/themes/:site?/filter/:filter',
 			'/themes/:site?/filter/:filter/type/:tier(free|premium)'
 		], redirectFilterAndType );
-		router( '/themes/:site?/:theme/:section(support)?', redirectToThemeDetails );
+		router( [
+			'/themes/:theme/:section(support)?',
+			'/themes/:site/:theme/:section(support)?'
+		], redirectToThemeDetails );
 		// The following route definition is needed so direct hits on `/themes/<mysite>` don't result in a 404.
 		router( '/themes/*', fetchThemeData, loggedOut, makeLayout );
 	}
Use unambiguous routes for support urls. (#<I>)