diff --git a/ui/owner-requirement.js b/ui/owner-requirement.js
index 230577c..d08bacc 100644
--- a/ui/owner-requirement.js
+++ b/ui/owner-requirement.js
@@ -64,19 +64,28 @@
           Loading status ...
         </p>
         <template is="dom-if" if="[[!_isLoading]]">
-          <template is="dom-if" if="[[!_pluginFailed(model.pluginStatus)]]">  
-            <span>[[_computeStatusText(_statusCount, _isOverriden)]]</span>
-            <template is="dom-if" if="[[_overrideInfoUrl]]">
-              <a on-click="_reportDocClick" href="[[_overrideInfoUrl]]"
-                target="_blank">
-                <iron-icon icon="gr-icons:help-outline"
-                  title="Documentation for overriding code owners"></iron-icon>
-              </a>
+          <template is="dom-if" if="[[!_pluginFailed(model.pluginStatus)]]">
+            <template is="dom-if" if="[[!model.branchConfig.no_code_owners_defined]]">              
+              <span>[[_computeStatusText(_statusCount, _isOverriden)]]</span>
+              <template is="dom-if" if="[[_overrideInfoUrl]]">
+                <a on-click="_reportDocClick" href="[[_overrideInfoUrl]]"
+                  target="_blank">
+                  <iron-icon icon="gr-icons:help-outline"
+                    title="Documentation for overriding code owners"></iron-icon>
+                </a>
+              </template>
+              <template is="dom-if" if="[[!_allApproved]]">
+                <gr-button link on-click="_openReplyDialog">
+                Suggest owners
+              </gr-button>
+              </template>
             </template>
-            <template is="dom-if" if="[[!_allApproved]]">
-              <gr-button link on-click="_openReplyDialog">
-              Suggest owners
-            </gr-button>
+            <template is="dom-if" if="[[model.branchConfig.no_code_owners_defined]]">                
+              <span>No code-owners file</span>
+              <a href="https://gerrit.googlesource.com/plugins/code-owners/+/master/resources/Documentation/user-guide.md#how-to-submit-changes-with-files-that-have-no-code-owners" target="_blank">
+                <iron-icon icon="gr-icons:help-outline"
+                  title="Documentation about submitting changes with files that have no code owners?"></iron-icon>
+              </a>
             </template>
           </template>
           <template is="dom-if" if="[[_pluginFailed(model.pluginStatus)]]">
diff --git a/ui/suggest-owners-trigger.js b/ui/suggest-owners-trigger.js
index 544c956..97f616d 100644
--- a/ui/suggest-owners-trigger.js
+++ b/ui/suggest-owners-trigger.js
@@ -28,7 +28,7 @@
       hidden: {
         type: Boolean,
         computed: '_computeHidden(model.pluginStatus,' +
-            'model.areAllFilesApproved, model.userRole)',
+            'model.areAllFilesApproved, model.userRole, model.branchConfig)',
         reflectToAttribute: true,
       },
     };
@@ -71,14 +71,17 @@
     this.modelLoader.loadUserRole();
     this.modelLoader.loadPluginStatus();
     this.modelLoader.loadAreAllFilesApproved();
+    this.modelLoader.loadBranchConfig();
   }
 
-  _computeHidden(pluginStatus, allFilesApproved, userRole) {
+  _computeHidden(pluginStatus, allFilesApproved, userRole, branchConfig) {
     if (pluginStatus === undefined ||
         allFilesApproved === undefined ||
-        userRole === undefined) {
+        userRole === undefined ||
+        branchConfig === undefined) {
       return true;
     }
+    if (branchConfig.no_code_owners_defined) return true;
     if (pluginStatus.state === PluginState.Enabled) {
       return allFilesApproved;
     } else {