diff --git a/src/query/interpreter.cpp b/src/query/interpreter.cpp
index e33d40d61..18c3089a9 100644
--- a/src/query/interpreter.cpp
+++ b/src/query/interpreter.cpp
@@ -568,8 +568,8 @@ Callback::CallbackFunction GetKafkaCreateCallback(StreamQuery *stream_query, Exp
                                            std::string_view map_name) -> std::unordered_map<std::string, std::string> {
     std::unordered_map<std::string, std::string> config_map;
     for (const auto [key_expr, value_expr] : map) {
-      auto key = key_expr->Accept(evaluator);
-      auto value = value_expr->Accept(evaluator);
+      const auto key = key_expr->Accept(evaluator);
+      const auto value = value_expr->Accept(evaluator);
       if (!key.IsString() || !value.IsString()) {
         throw SemanticException("{} must contain only string keys and values!", map_name);
       }
diff --git a/src/query/stream/streams.cpp b/src/query/stream/streams.cpp
index 2bafad452..1763956a3 100644
--- a/src/query/stream/streams.cpp
+++ b/src/query/stream/streams.cpp
@@ -310,7 +310,7 @@ void Streams::RegisterKafkaProcedures() {
                   return configs_value;
                 };
 
-                auto configs_value = convert_config_map(info.configs);
+                const auto configs_value = convert_config_map(info.configs);
                 if (configs_value == nullptr) {
                   return;
                 }
@@ -323,7 +323,7 @@ void Streams::RegisterKafkaProcedures() {
                                  return {pair.first, integrations::kReducted};
                                });
 
-                auto credentials_value = convert_config_map(reducted_credentials);
+                const auto credentials_value = convert_config_map(reducted_credentials);
                 if (credentials_value == nullptr) {
                   return;
                 }