diff --git a/src/dataquery/service.py b/src/dataquery/service.py
index 19d6721..d8dfee9 100644
--- a/src/dataquery/service.py
+++ b/src/dataquery/service.py
@@ -86,6 +86,9 @@ class DataQueryService:
         """
         max_limit = settings.SQL_ROW_LIMIT
 
+        # Strip trailing semicolons and whitespace to prevent multi-statement errors
+        query = query.rstrip("; \t\n\r")
+
         # Remove comments and normalize whitespace for parsing
         cleaned_query = re.sub(r"--.*$", "", query, flags=re.MULTILINE)
         cleaned_query = re.sub(r"/\*.*?\*/", "", cleaned_query, flags=re.DOTALL)