diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index 40d378c8c..a4defecbc 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -69,6 +69,7 @@ public ListImagesCmd withLabelFilter(Map<String, String> labels) {
     public ListImagesCmd withImageNameFilter(String imageNameFilter) {
         Objects.requireNonNull(imageNameFilter, "image name filter not specified");
         this.imageNameFilter = imageNameFilter;
+        withFilter("reference", Collections.singletonList(imageNameFilter));
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
index 9f53e76bd..1ce6fd24c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
@@ -31,10 +31,6 @@ protected List<Image> execute(ListImagesCmd command) {
             webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
-       if (command.getImageNameFilter() != null) {
-            webTarget = webTarget.queryParam("filter", command.getImageNameFilter());
-       }
-
         LOGGER.trace("GET: {}", webTarget);
 
         List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)