diff --git a/changelog.d/mirrord-ls-hanging.fixed.md b/changelog.d/mirrord-ls-hanging.fixed.md
new file mode 100644
index 00000000000..9dda409dfc7
--- /dev/null
+++ b/changelog.d/mirrord-ls-hanging.fixed.md
@@ -0,0 +1 @@
+Fixed `mirrord ls` hanging when there is a lot of possible targets in the cluster.
\ No newline at end of file
diff --git a/mirrord/kube/src/api/kubernetes/seeker.rs b/mirrord/kube/src/api/kubernetes/seeker.rs
index 969642fccf8..97c6b1a93d0 100644
--- a/mirrord/kube/src/api/kubernetes/seeker.rs
+++ b/mirrord/kube/src/api/kubernetes/seeker.rs
@@ -164,7 +164,7 @@ impl KubeResourceSeeker<'_> {
                     yield Ok(resource);
                 }
 
-                if let Some(continue_token) = resource.metadata.continue_ {
+                if let Some(continue_token) = resource.metadata.continue_ && !continue_token.is_empty() {
                     params = params.continue_token(&continue_token);
                 } else {
                     break;