diff --git a/duckdb b/duckdb
index 44fec4a..d5c4422 160000
--- a/duckdb
+++ b/duckdb
@@ -1 +1 @@
-Subproject commit 44fec4a8121bdfaacc9b59255e6543c157171d6e
+Subproject commit d5c4422f728469cc6bb3e41fe1dbf196321fa1f1
diff --git a/src/aws_extension.cpp b/src/aws_extension.cpp
index e1467a2..6f78fca 100644
--- a/src/aws_extension.cpp
+++ b/src/aws_extension.cpp
@@ -3,6 +3,7 @@
 #include "aws_extension.hpp"
 #include "duckdb.hpp"
 #include "duckdb/common/exception.hpp"
+#include "duckdb/catalog/catalog.hpp"
 #include "duckdb/main/extension_util.hpp"
 #include <duckdb/parser/parsed_data/create_scalar_function_info.hpp>
 #include <aws/core/Aws.h>
@@ -104,7 +105,7 @@ static void LoadAWSCredentialsFun(ClientContext &context, TableFunctionInput &da
 		return;
 	}
 
-	if (!context.db->ExtensionIsLoaded("httpfs")) {
+	if (!Catalog::TryAutoLoad(context, "httpfs")) {
 		throw MissingExtensionException("httpfs extension is required for load_aws_credentials");
 	}
 
diff --git a/test/sql/aws_errors.test b/test/sql/aws_errors.test
index a4ca207..50fb7d7 100644
--- a/test/sql/aws_errors.test
+++ b/test/sql/aws_errors.test
@@ -2,6 +2,8 @@
 # description: test aws extension
 # group: [aws]
 
+require no_extension_autoloading
+
 # Before we load the extension, this will fail
 statement error
 CALL load_aws_credentials();