diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
index a142dd7641..4ec9ed4320 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
@@ -1,4 +1,7 @@
-from typing import Optional
+import typing
+from typing import List, Optional
+
+from sqlalchemy.engine.reflection import Inspector
 
 from datahub.ingestion.source.sql.sql_common import (
     SQLAlchemyConfig,
@@ -40,3 +43,11 @@ class AthenaSource(SQLAlchemySource):
     def create(cls, config_dict, ctx):
         config = AthenaConfig.parse_obj(config_dict)
         return cls(config, ctx)
+
+    # It seems like database/schema filter in the connection string does not work and this to work around that
+    def get_schema_names(self, inspector: Inspector) -> List[str]:
+        athena_config = typing.cast(AthenaConfig, self.config)
+        schemas = inspector.get_schema_names()
+        if athena_config.database:
+            return [schema for schema in schemas if schema == athena_config.database]
+        return schemas