diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8089052e..5fc04ac41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v.0.21.7
+
+### Changes
+
+- Disallowed setting of `threads` in `profiles.yml` to a value greater than 1.
+
 ## v.0.21.6
 
 ### Changes
diff --git a/dbt/adapters/firebolt/__version__.py b/dbt/adapters/firebolt/__version__.py
index 1db4b6972..4eb939969 100644
--- a/dbt/adapters/firebolt/__version__.py
+++ b/dbt/adapters/firebolt/__version__.py
@@ -1 +1 @@
-version = '0.21.6'
+version = '0.21.7'
diff --git a/dbt/adapters/firebolt/connections.py b/dbt/adapters/firebolt/connections.py
index 21197b949..94896c615 100644
--- a/dbt/adapters/firebolt/connections.py
+++ b/dbt/adapters/firebolt/connections.py
@@ -77,7 +77,7 @@ class FireboltConnectionManager(SQLConnectionManager):
     def open(cls, connection):
         if connection.state == 'open':
             return connection
-        credentials = cls.get_credentials(connection.credentials)
+        credentials = connection.credentials
         jdbc_url = cls.make_jdbc_url(cls, credentials)
 
         try:
@@ -181,10 +181,6 @@ def commit(self):
         Firebolt does not yet support transactions.
         """
 
-    @classmethod
-    def get_credentials(cls, credentials):
-        return credentials
-
     def cancel(self, connection):
         """Cancel the last query on the given connection."""
         raise dbt.exceptions.NotImplementedException(
diff --git a/dbt/include/firebolt/macros/adapters.sql b/dbt/include/firebolt/macros/adapters.sql
index a44611298..99e74aadb 100644
--- a/dbt/include/firebolt/macros/adapters.sql
+++ b/dbt/include/firebolt/macros/adapters.sql
@@ -23,6 +23,9 @@
 
 
 {% macro firebolt__list_schemas(database) %}
+    {% if target.threads > 1 %}
+        {{ exceptions.raise_compiler_error("Firebolt does not currently support more than one thread.") }}
+    {% endif %}
     {% call statement('list_schemas', fetch_result=True, auto_begin=False) %}
         SELECT '{{target.schema}}' AS schema
     {% endcall %}