diff --git a/src/views/settings.html b/src/views/settings.html
index 5e80b31bc..e5e9623e3 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -319,7 +319,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="config.features.privateDockerRegistry">
+    <div class="row" ng-show="config.features.privateDockerRegistry && registryConfig.currentConfig.provider !== 'noop'">
       <div class="col-xs-6">
         <span class="text-muted">{{ 'settings.privateDockerRegistry.server' | tr }}</span>
       </div>
@@ -328,7 +328,7 @@
       </div>
     </div>
 
-    <div class="row" ng-show="config.features.privateDockerRegistry">
+    <div class="row" ng-show="config.features.privateDockerRegistry && registryConfig.currentConfig.provider !== 'noop'">
       <div class="col-xs-6">
         <span class="text-muted">{{ 'settings.privateDockerRegistry.username' | tr }}</span>
       </div>