diff --git a/CHANGELOG.md b/CHANGELOG.md
index 553eaaa..d306d90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # CHANGELOG
+0.2.50
+- fix: error when client_id absent
+
 0.2.49
 - add: Multiple flow id support for fetch calls
 - update: Credentials to access FSM db
diff --git a/pyproject.toml b/pyproject.toml
index 9aed3fe..838a104 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "skit-calls"
-version = "0.2.49"
+version = "0.2.50"
 description = "Library to fetch calls from a given environment."
 authors = ["ltbringer <amresh.venugopal@gmail.com>"]
 license = "GPL-3.0-only"
diff --git a/secrets.dvc b/secrets.dvc
index 942b81d..e87a96d 100644
--- a/secrets.dvc
+++ b/secrets.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: 4a03ddfb64863843358d879baa872af6.dir
-  size: 5552
+- md5: a54ebfb809755748297b44f75fd426a7.dir
+  size: 5556
   nfiles: 5
   path: secrets
diff --git a/skit_calls/data/query.py b/skit_calls/data/query.py
index 873199d..3599533 100644
--- a/skit_calls/data/query.py
+++ b/skit_calls/data/query.py
@@ -42,11 +42,11 @@ def gen_random_call_ids(
     random_id_limit: int = const.DEFAULT_CALL_QUANTITY,
 ):
     excluded_numbers = set(excluded_numbers) or set()
-    ids_ = set(ids_) or set()
-    if not ids_ or template_id :
+    
+    if ids_:
+        ids_= tuple(set(ids_))
+    else:
         ids_ = None
-    elif ids_ and   not template_id:
-        ids_= tuple(ids_)
     excluded_numbers = excluded_numbers.union(const.DEFAULT_IGNORE_CALLERS_LIST)
     reported_status = 0 if reported else None
     call_filters = {