diff --git a/plugins/c9.preview/preview.handler.js b/plugins/c9.preview/preview.handler.js
index 6b1f8ae7..3e827c63 100644
--- a/plugins/c9.preview/preview.handler.js
+++ b/plugins/c9.preview/preview.handler.js
@@ -122,8 +122,6 @@ define(function(require, exports, module) {
                 }
                         
                 var url = server + "/" + req.projectSession.pid + "/preview";
-                if (req.session.token)
-                    url += "?access_token=" + encodeURIComponent(req.session.token);
                     
                 req.proxyUrl = url;
                 next();
@@ -135,6 +133,8 @@ define(function(require, exports, module) {
                 
                 var path = req.params.path;
                 var url = req.proxyUrl + path;
+                if (req.session.token)
+                    url += "?access_token=" + encodeURIComponent(req.session.token);
 
                 var parsedUrl = parseUrl(url);
                 var httpModule = parsedUrl.protocol == "https:" ? https : http;