diff --git a/tabpy/tabpy_tools/client.py b/tabpy/tabpy_tools/client.py
index 6a3f67db..bf355889 100644
--- a/tabpy/tabpy_tools/client.py
+++ b/tabpy/tabpy_tools/client.py
@@ -380,7 +380,6 @@ def _gen_endpoint(self, name, obj, description, version=1, schema=None, is_publi
             description = obj.__doc__.strip() or "" if isinstance(obj.__doc__, str) else ""
 
         endpoint_object = CustomQueryObject(query=obj, description=description,)
-        docstring = "-- no docstring found in query function --"
 
         return {
             "name": name,
@@ -392,7 +391,7 @@ def _gen_endpoint(self, name, obj, description, version=1, schema=None, is_publi
             "methods": endpoint_object.get_methods(),
             "required_files": [],
             "required_packages": [],
-            "docstring": docstring,
+            "docstring": endpoint_object.get_doc_string(),
             "schema": copy.copy(schema),
             "is_public": is_public,
         }