diff --git a/nc_password_client/nc_password_client.py b/nc_password_client/nc_password_client.py
index 7fd0dc5..779528b 100755
--- a/nc_password_client/nc_password_client.py
+++ b/nc_password_client/nc_password_client.py
@@ -1312,7 +1312,7 @@ class NcPasswordClient:
                         password
                     )
                     count += 1
-                if count >= limit:
+                if limit != -1 and count >= limit:
                     return True
         self.info(
             {
@@ -1490,7 +1490,7 @@ def delete_passwords_folder(ctx, name):
 
 @cli.command()
 @click.option('--pattern', '-p', required=True, help='Regular expression pattern to search in the password fields')
-@click.option('--limit', '-l', default=1, help='Maximun number of passwords to show')
+@click.option('--limit', '-l', default=-1, help='Maximun number of passwords to show. -1 for unlimited.')
 @click_config_file.configuration_option()
 @click.pass_context
 def search(ctx, pattern, limit):