diff --git a/fastanime/cli/commands/download.py b/fastanime/cli/commands/download.py
index 025301e..915dd55 100644
--- a/fastanime/cli/commands/download.py
+++ b/fastanime/cli/commands/download.py
@@ -120,8 +120,10 @@ def download(
                     episodes_start, episodes_end = ep_range_tuple
                     if episodes_start.strip():
                         episodes_range = episodes[int(episodes_start) :]
-                    else:
+                    elif episodes_end.strip():
                         episodes_range = episodes[: int(episodes_end)]
+                    else:
+                        episodes_range = episodes
             else:
                 episodes_range = episodes[int(episode_range) :]
             print(f"[green bold]Downloading: [/] {episodes_range}")
diff --git a/fastanime/cli/commands/search.py b/fastanime/cli/commands/search.py
index 4c85a75..21799e1 100644
--- a/fastanime/cli/commands/search.py
+++ b/fastanime/cli/commands/search.py
@@ -107,10 +107,12 @@ def search(config: Config, anime_titles: str, episode_range: str):
                     episodes_range = episodes[int(episodes_start) : int(episodes_end)]
                 else:
                     episodes_start, episodes_end = ep_range_tuple
-                    if episodes_start:
+                    if episodes_start.strip():
                         episodes_range = episodes[int(episodes_start) :]
-                    else:
+                    elif episodes_end.strip():
                         episodes_range = episodes[: int(episodes_end)]
+                    else:
+                        episodes_range = episodes
             else:
                 episodes_range = episodes[int(episode_range) :]