diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index de61690aea..41790a5aaa 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -155,7 +155,7 @@ func imagesCmd(c *cliconfig.ImagesValues) error {
 		return errors.New("can not specify an image and a filter")
 	}
 	filters := c.Filter
-	if len(filters) < 1 {
+	if len(filters) < 1 && len(image) > 0 {
 		filters = append(filters, fmt.Sprintf("reference=%s", image))
 	}
 
diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index 220d4cf75e..d87de481c0 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -201,8 +201,11 @@ func (r *LocalRuntime) GetRWImages() ([]*ContainerImage, error) {
 }
 
 func (r *LocalRuntime) GetFilteredImages(filters []string, rwOnly bool) ([]*ContainerImage, error) {
+	if len(filters) > 0 {
+		return nil, errors.Wrap(define.ErrNotImplemented, "filtering images is not supported on the remote client")
+	}
 	var newImages []*ContainerImage
-	images, err := iopodman.ListImagesWithFilters().Call(r.Conn, filters)
+	images, err := iopodman.ListImages().Call(r.Conn)
 	if err != nil {
 		return nil, err
 	}