diff --git a/src/js/riotHotReload.js b/src/js/riotHotReload.js
index 4c9807554..9961ec8db 100644
--- a/src/js/riotHotReload.js
+++ b/src/js/riotHotReload.js
@@ -55,7 +55,4 @@
 
     riot.observable(reload);
     riot.reload = reload;
-    //if (riot.default) {
-    //    riot.default.reload = reload;
-    //}
 })();
diff --git a/src/riotTags/notepad-panel.tag b/src/riotTags/notepad-panel.tag
index 1a112f5aa..552931e2c 100644
--- a/src/riotTags/notepad-panel.tag
+++ b/src/riotTags/notepad-panel.tag
@@ -123,13 +123,13 @@ notepad-panel#notepad.panel.dockright(class="{opened: opened}")
 
         var openDocs = e => {
             this.changeTab('helppages')();
-            this.refs.helpIframe.contentWindow.location = `http://localhost:${fileServer.address().port}${e.path || '/'}`;
+            this.refs.helpIframe.contentWindow.location = `http://localhost:${this.server.address().port}${e.path || '/'}`;
             this.opened = true;
             this.update();
         };
 
         this.backToHome = () => {
-            this.refs.helpIframe.contentWindow.location = `http://localhost:${fileServer.address().port}/`;
+            this.refs.helpIframe.contentWindow.location = `http://localhost:${this.server.address().port}/`;
         };
 
         window.signals.on('openDocs', openDocs);