diff --git a/examples/html/entityList.html b/examples/html/entityList.html
index bbfa4d81b8..bcc1c117ea 100644
--- a/examples/html/entityList.html
+++ b/examples/html/entityList.html
@@ -20,6 +20,7 @@
             elRefresh = document.getElementById("refresh");
             elDelete = document.getElementById("delete");
             elTeleport = document.getElementById("teleport");
+            elNoEntitiesMessage = document.getElementById("no-entities");
 
             document.getElementById("entity-type").onclick = function() {
                 setSortColumn('type');
@@ -155,11 +156,18 @@
                         }
                     } else if (data.type == "update") {
                         var newEntities = data.entities;
-                        for (var i = 0; i < newEntities.length; i++) {
-                            var id = newEntities[i].id;
-                            addEntity(id, newEntities[i].type, newEntities[i].url);
+                        if (newEntities.length == 0) {
+                            elEntityTable.style.display = "none";
+                            elNoEntitiesMessage.style.display = "block";
+                        } else {
+                            elEntityTable.style.display = "table";
+                            elNoEntitiesMessage.style.display = "none";
+                            for (var i = 0; i < newEntities.length; i++) {
+                                var id = newEntities[i].id;
+                                addEntity(id, newEntities[i].type, newEntities[i].url);
+                            }
+                            updateSelectedEntities(data.selectedIDs);
                         }
-                        updateSelectedEntities(data.selectedIDs);
                     }
                 });
                 setTimeout(refreshEntities, 1000);
@@ -194,6 +202,8 @@
             </tbody>
         </table>
     </div>
-
+    <div id="no-entities">
+        No entities found within 50 meter radius. Try moving to a different location and refreshing.
+    </div>
 </body>
 </html>
diff --git a/examples/html/style.css b/examples/html/style.css
index 7177b8c8ba..5d60835e47 100644
--- a/examples/html/style.css
+++ b/examples/html/style.css
@@ -257,3 +257,11 @@ td {
 
         vertical-align: top;
 }
+
+#no-entities {
+    display: none;
+    font-size: 120%;
+    padding: 10pt;
+    font-weight: bold;
+    font-style: italic;
+}