diff --git a/html/pages/device-groups.inc.php b/html/pages/device-groups.inc.php
index 891b42c20..e5e6c9918 100644
--- a/html/pages/device-groups.inc.php
+++ b/html/pages/device-groups.inc.php
@@ -3,23 +3,31 @@ require_once 'includes/modal/new_device_group.inc.php';
 require_once 'includes/modal/delete_device_group.inc.php';
 
 $no_refresh = true;
-
+$group_count_check = array_filter(GetDeviceGroups());
+if(!empty($group_count_check)) { 
 echo '<div class="row"><div class="col-sm-12"><span id="message"></span></div></div>';
 echo '<div class="table-responsive">';
 echo '<table class="table table-condensed table-hover"><thead><tr>';
 echo '<th>Name</th><th>Description</th><th>Pattern</th><th>Actions</th>';
 echo '</tr></thead><tbody>';
-foreach (GetDeviceGroups() as $group) {
-    echo '<tr id="row_'.$group['id'].'">';
-    echo '<td>'.$group['name'].'</td>';
-    echo '<td>'.$group['desc'].'</td>';
-    echo '<td>'.$group['pattern'].'</td>';
-    echo '<td>';
-        echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-group' data-group_id='".$group['id']."' name='edit-device-group'><span class='glyphicon glyphicon-pencil' aria-hidden='true'></span></button> ";
-        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-group_id='".$group['id']."' name='delete-device-group'><span class='glyphicon glyphicon-trash' aria-hidden='true'></span></button>";
-    echo '</td>';
-    echo '</tr>';
-}
-
+	foreach (GetDeviceGroups() as $group) {
+	    echo '<tr id="row_'.$group['id'].'">';
+	    echo '<td>'.$group['name'].'</td>';
+	    echo '<td>'.$group['desc'].'</td>';
+	    echo '<td>'.$group['pattern'].'</td>';
+	    echo '<td>';
+	        echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-group' data-group_id='".$group['id']."' name='edit-device-group'><span class='glyphicon glyphicon-pencil' aria-hidden='true'></span></button> ";
+	        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-group_id='".$group['id']."' name='delete-device-group'><span class='glyphicon glyphicon-trash' aria-hidden='true'></span></button>";
+	    echo '</td>';
+	    echo '</tr>';
+	}
+} else { //if $group_count_check is empty, aka no group found, then display a message to the user.
+	echo "<center>Looks like no groups have been created, let's create one now. Click on <b>Create New Group</b> to create one.</center><br>";
+	echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
+}	
 echo '</tbody></table></div>';
-echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button> ";
+
+if(!empty($group_count_check)) { //display create new node group when $group_count_check has a value so that the user can define more groups in the future.
+echo "<hr>";
+echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
+}