diff --git a/templates/demo/app/components/storage.js b/templates/demo/app/components/storage.js
index 7c5270091..88526c064 100644
--- a/templates/demo/app/components/storage.js
+++ b/templates/demo/app/components/storage.js
@@ -151,6 +151,10 @@ class Storage extends React.Component {
     });
   }
 
+  isIpfs(){
+    return EmbarkJS.Storage.currentStorageName === 'ipfs';
+  }
+
   render() {
     return <React.Fragment>
       {
@@ -215,7 +219,7 @@ class Storage extends React.Component {
         </FormGroup>
       </Form>
 
-      <Alert bsStyle="warning">The 2 functions below are only available with IPFS</Alert>
+      {!this.isIpfs() && <Alert bsStyle="warning">The 2 functions below are only available with IPFS</Alert>}
 
       <h3>Register to IPNS</h3>
       <Form inline onKeyDown={(e) => this.checkEnter(e, this.ipnsRegister)}>
diff --git a/templates/demo/config/communication.js b/templates/demo/config/communication.js
index b776b339e..e8998cf29 100644
--- a/templates/demo/config/communication.js
+++ b/templates/demo/config/communication.js
@@ -14,7 +14,7 @@ module.exports = {
       port: 8546, // Port of the blockchain node
       type: "ws" // Type of connection (ws or rpc)
     }
-  }
+  },
 
   // merges with the settings in default
   // used with "embark run privatenet"
diff --git a/templates/demo/config/namesystem.js b/templates/demo/config/namesystem.js
index 09a6e3f78..35ef7e9a9 100644
--- a/templates/demo/config/namesystem.js
+++ b/templates/demo/config/namesystem.js
@@ -14,7 +14,7 @@ module.exports = {
         'status': '0x1a2f3b98e434c02363f3dac3174af93c1d690914'
       }
     }
-  }
+  },
 
   // merges with the settings in default
   // used with "embark run privatenet"