diff --git a/deps/rabbitmq_management/priv/www/js/help.js b/deps/rabbitmq_management/priv/www/js/help.js
index 80d3d15d45..b89ad46cfd 100644
--- a/deps/rabbitmq_management/priv/www/js/help.js
+++ b/deps/rabbitmq_management/priv/www/js/help.js
@@ -175,6 +175,8 @@ HELP = {
         <dd>Rate at which basic.return is sent to publishers for undeliverable  messages published with the \'immediate\' flag set.</dd>\
       </dl>',
 
+    'disk-monitoring-no-watermark' : 'There is no disk space low watermark set. RabbitMQ will not take any action to avoid running out of disk space.',
+
     'foo': 'foo' // No comma.
 };
 
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs
index 0951eddc00..07bff9749a 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs
@@ -85,9 +85,13 @@
          <%= fmt_bytes(node.disk_free) %>
        </div>
    <% } %>
-   <sub><%= fmt_bytes(node.disk_free_limit) %> low watermark</sub>
+   <% if (node.disk_free_limit == 0) { %>
+     <sub>No low watermark <span class="help" id="disk-monitoring-no-watermark"></span></sub>
+   <% } else { %>
+     <sub><%= fmt_bytes(node.disk_free_limit) %> low watermark </sub>
+   <% } %>
 <% } else { %>
-         (not monitored)
+         (not available)
 <% } %>
       </td>
     </tr>
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
index 85ec6cf9f3..f08a1b01ba 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
@@ -166,9 +166,14 @@ if (version_warning) {
          <%= fmt_bytes(node.disk_free) %>
        </div>
    <% } %>
-   <sub><%= fmt_bytes(node.disk_free_limit) %> low watermark </sub>
+   <% if (node.disk_free_limit == 0) { %>
+     <sub>No low watermark <span class="help" id="disk-monitoring-no-watermark"></span></sub>
+   <% } else { %>
+     <sub><%= fmt_bytes(node.disk_free_limit) %> low watermark </sub>
+   <% } %>
+
 <% } else { %>
-         (not monitored)
+         (not available)
 <% } %>
      </td>
      <td class="r">