diff --git a/app/docker/components/imageRegistry/por-image-registry.js b/app/docker/components/imageRegistry/por-image-registry.js
index 39d6a5919..260190ee7 100644
--- a/app/docker/components/imageRegistry/por-image-registry.js
+++ b/app/docker/components/imageRegistry/por-image-registry.js
@@ -4,7 +4,6 @@ angular.module('portainer.docker').component('porImageRegistry', {
   bindings: {
     'model': '=', // must be of type PorImageRegistryModel
     'pullWarning': '<',
-    'autoComplete': '<',
     'labelClass': '@',
     'inputClass': '@'
   },
diff --git a/app/docker/components/imageRegistry/porImageRegistry.html b/app/docker/components/imageRegistry/porImageRegistry.html
index bcb280d96..e8cdcce45 100644
--- a/app/docker/components/imageRegistry/porImageRegistry.html
+++ b/app/docker/components/imageRegistry/porImageRegistry.html
@@ -5,8 +5,8 @@
     <div ng-class="$ctrl.inputClass">
       <div class="input-group">
         <span class="input-group-addon" id="registry-name">{{$ctrl.model.Registry.URL || 'docker.io'}}</span>
-        <input type="text" class="form-control" aria-describedby="registry-name" uib-typeahead="image for image in $ctrl.availableImages | filter:$viewValue | limitTo:5"
-        ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. myImage:myTag" required>
+        <input type="text" class="form-control" aria-describedby="registry-name"
+          ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. myImage:myTag" required>
       </div>
     </div>
     <label for="image_registry" class="margin-sm-top control-label text-right" ng-class="$ctrl.labelClass">
diff --git a/app/docker/components/imageRegistry/porImageRegistryController.js b/app/docker/components/imageRegistry/porImageRegistryController.js
index d6f6e5010..6305e606c 100644
--- a/app/docker/components/imageRegistry/porImageRegistryController.js
+++ b/app/docker/components/imageRegistry/porImageRegistryController.js
@@ -3,11 +3,10 @@ import _ from 'lodash-es';
 
 class porImageRegistryController {
   /* @ngInject */
-  constructor($async, RegistryService, DockerHubService, ImageService, Notifications) {
+  constructor($async, RegistryService, DockerHubService, Notifications) {
     this.$async = $async;
     this.RegistryService = RegistryService;
     this.DockerHubService = DockerHubService;
-    this.ImageService = ImageService;
     this.Notifications = Notifications;
 
     this.onInit = this.onInit.bind(this);
@@ -15,12 +14,10 @@ class porImageRegistryController {
 
   async onInit() {
     try {
-      const [registries, dockerhub, availableImages] = await Promise.all([
+      const [registries, dockerhub] = await Promise.all([
         this.RegistryService.registries(),
         this.DockerHubService.dockerhub(),
-        this.autoComplete ? this.ImageService.images() : []
       ]);
-      this.availableImages = this.ImageService.getUniqueTagListFromImages(availableImages);
       this.availableRegistries = _.concat(dockerhub, registries);
 
       const id = this.model.Registry.Id;
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 2d5d13b3c..bee08d792 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -31,7 +31,6 @@
               model="formValues.RegistryModel"
               pull-warning="formValues.alwaysPull"
               ng-if="formValues.RegistryModel.Registry"
-              auto-complete="true"
               label-class="col-sm-1" input-class="col-sm-11 col-md-5"
             ></por-image-registry>
             <!-- !image-and-registry -->
diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html
index 25c5986cd..b1785797f 100644
--- a/app/docker/views/containers/edit/container.html
+++ b/app/docker/views/containers/edit/container.html
@@ -156,7 +156,6 @@
             <!-- image-and-registry -->
             <por-image-registry
               model="config.RegistryModel"
-              auto-complete="true"
               label-class="col-sm-1" input-class="col-sm-11 col-md-5"
             ></por-image-registry>
             <!-- !image-and-registry -->
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index e3e44b6c6..2d24d2608 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -24,7 +24,6 @@
           <!-- image-and-registry -->
           <por-image-registry
             model="formValues.RegistryModel"
-            auto-complete="true"
             label-class="col-sm-1" input-class="col-sm-11 col-md-5"
           ></por-image-registry>
           <!-- !image-and-registry -->
diff --git a/app/docker/views/services/edit/includes/image.html b/app/docker/views/services/edit/includes/image.html
index 1b8a8754e..03e56099e 100644
--- a/app/docker/views/services/edit/includes/image.html
+++ b/app/docker/views/services/edit/includes/image.html
@@ -6,7 +6,6 @@
       <form class="form-horizontal">
         <por-image-registry
           model="formValues.RegistryModel"
-          auto-complete="true"
           label-class="col-sm-1" input-class="col-sm-11 col-md-5"
         ></por-image-registry>
       </form>
diff --git a/app/portainer/components/forms/template-form/templateForm.html b/app/portainer/components/forms/template-form/templateForm.html
index 114c3ebf7..608e74595 100644
--- a/app/portainer/components/forms/template-form/templateForm.html
+++ b/app/portainer/components/forms/template-form/templateForm.html
@@ -204,7 +204,6 @@
     <div uib-collapse="$ctrl.state.collapseContainer">
       <por-image-registry
         model="$ctrl.model.RegistryModel"
-        auto-complete="true"
         label-class="col-sm-1" input-class="col-sm-11 col-md-5"
       ></por-image-registry>
       <!-- command -->