diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js
index febc6b8ddb..f1e6aada99 100644
--- a/awx/ui/client/src/forms/Users.js
+++ b/awx/ui/client/src/forms/Users.js
@@ -138,8 +138,6 @@ export default
                     iterator: 'team',
                     open: false,
                     index: false,
-                    suppressEmptyText: true,
-
                     actions: {},
 
                     fields: {
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index c75bfd7afb..4466229ab8 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1839,10 +1839,12 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
 
                 // Show the "no items" box when loading is done and the user isn't actively searching and there are no results
                 // Allow for the suppression of the empty list text to avoid duplication between form generator and list generator
-                if(!collection.suppressEmptyText || collection.suppressEmptyText === false) {
+                //if(collection.hideOnSuperuser && collection.hideOnSuperuser !== true) {
                     var emptyListText = (collection.emptyListText) ? collection.emptyListText : "PLEASE ADD ITEMS TO THIS LIST";
-                    html += "<div class=\"List-noItems\" ng-show=\"" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows < 1\">" + emptyListText + "</div>";
-                }
+                    html += '<div ng-hide="is_superuser">';
+                    html += "<div class=\"List-noItems\" ng-hide=\"is_superuser\" ng-show=\"" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows < 1\">" + emptyListText + "</div>";
+                    html += '</div>';
+                //}
 
                 html += `
                     <div class=\"List-noItems\" ng-show=\"is_superuser\">