diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6334fac66..c48057e0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -135,6 +135,11 @@ Nodes
  - Add expand editor button to Template node
  - Update catch/status nodes to use selectNodes api and treeList
 
+#### 0.20.8: Maintenance Release
+
+ - Sanitize tab name in edit dialog
+ - Pass httpServer to runtime even when httpAdmin disabled Fixes #2272
+
 #### 0.20.7: Maintenance Release
 
  - Update jsonata to 1.6.5 which should fix #2183
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index 91fa8e34a..c3943b0d5 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -70,7 +70,7 @@ RED.workspaces = (function() {
         RED.view.state(RED.state.EDITING);
         var tabflowEditor;
         var trayOptions = {
-            title: RED._("workspace.editFlow",{name:workspace.label}),
+            title: RED._("workspace.editFlow",{name:RED.utils.sanitize(workspace.label)}),
             buttons: [
                 {
                     id: "node-dialog-delete",
diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js
index 4d7269518..9a4d77862 100644
--- a/packages/node_modules/node-red/lib/red.js
+++ b/packages/node_modules/node-red/lib/red.js
@@ -76,7 +76,7 @@ module.exports = {
             apiEnabled = true;
             server = httpServer;
         } else {
-            runtime.init(userSettings);
+            runtime.init(userSettings, httpServer);
             apiEnabled = false;
             if (httpServer) {
                 server = httpServer;