diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 66ece72d23..fe9bef8c9b 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -9,7 +9,7 @@
       "typings": "typings install",
       "postinstall": "npm run typings && npm run build",
       "start": "concurrently \"npm run build:w\" \"npm run server\" ",
-      "server": "wsrv -o -l -s",
+      "server": "wsrv -o -s -l",
       "build": "npm run tslint && rimraf dist && tsc",
       "build:w": "npm run tslint && rimraf dist && tsc -w",
       "tslint": "npm run tslint-src && npm run tslint-root",
diff --git a/ng2-components/ng2-alfresco-login/demo/wsrv-config.json b/ng2-components/ng2-alfresco-login/demo/wsrv-config.json
new file mode 100644
index 0000000000..3cc175c807
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/demo/wsrv-config.json
@@ -0,0 +1,6 @@
+{
+    "watch": [
+        "node_modules/ng2-alfresco-core/dist/**/*.{html,htm,css,js}",
+        "node_modules/ng2-alfresco-login/dist/**/*.{html,htm,css,js}"
+    ]
+}
diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index fcf6039779..31fea78d7f 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -9,7 +9,7 @@
     "postinstall": "npm run typings && npm run build",
     "typings": "typings install",
     "start": "concurrently \"npm run build:w\" \"npm run server\" ",
-    "server": "wsrv -o -l -s",
+    "server": "wsrv -o -s -l",
     "build": "npm run tslint && rimraf dist && tsc",
     "build:w": "npm run tslint && rimraf dist && tsc -w",
     "tslint": "npm run tslint-src && npm run tslint-root",
diff --git a/ng2-components/ng2-alfresco-search/demo/wsrv-config.json b/ng2-components/ng2-alfresco-search/demo/wsrv-config.json
new file mode 100644
index 0000000000..73dcca3a2b
--- /dev/null
+++ b/ng2-components/ng2-alfresco-search/demo/wsrv-config.json
@@ -0,0 +1,7 @@
+{
+    "watch": [
+        "node_modules/ng2-alfresco-core/dist/**/*.{html,htm,css,js}",
+        "node_modules/ng2-alfresco-search/dist/**/*.{html,htm,css,js}",
+        "node_modules/ng2-alfresco-viewer/dist/**/*.{html,htm,css,js}"
+    ]
+}
diff --git a/ng2-components/ng2-alfresco-upload/demo/wsrv-config.json b/ng2-components/ng2-alfresco-upload/demo/wsrv-config.json
new file mode 100644
index 0000000000..3e69314748
--- /dev/null
+++ b/ng2-components/ng2-alfresco-upload/demo/wsrv-config.json
@@ -0,0 +1,6 @@
+{
+    "watch": [
+        "node_modules/ng2-alfresco-core/dist/**/*.{html,htm,css,js}",
+        "node_modules/ng2-alfresco-upload/dist/**/*.{html,htm,css,js}"
+    ]
+}
diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json
index c16978744c..0d61719895 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/package.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/package.json
@@ -9,7 +9,7 @@
     "typings": "typings install",
     "postinstall": "npm run typings && npm run build",
     "start": "concurrently \"npm run build:w\" \"npm run server\" ",
-    "server": "wsrv -o -l -s",
+    "server": "wsrv -o -s -l",
     "build": "npm run tslint && rimraf dist && tsc",
     "build:w": "npm run tslint && rimraf dist && tsc -w",
     "tslint": "npm run tslint-src && npm run tslint-root",
diff --git a/ng2-components/ng2-alfresco-viewer/demo/wsrv-config.json b/ng2-components/ng2-alfresco-viewer/demo/wsrv-config.json
new file mode 100644
index 0000000000..0859dac75a
--- /dev/null
+++ b/ng2-components/ng2-alfresco-viewer/demo/wsrv-config.json
@@ -0,0 +1,6 @@
+{
+    "watch": [
+        "node_modules/ng2-alfresco-core/dist/**/*.{html,htm,css,js}",
+        "node_modules/ng2-alfresco-viewer/dist/**/*.{html,htm,css,js}"
+    ]
+}