diff --git a/common/repositories/base/base_bot_data_repository.h b/common/repositories/base/base_bot_data_repository.h
index 7cf1e1306..da0b67af7 100644
--- a/common/repositories/base/base_bot_data_repository.h
+++ b/common/repositories/base/base_bot_data_repository.h
@@ -301,8 +301,8 @@ public:
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} WHERE {} = {} LIMIT 1",
-				PrimaryKey(),
 				BaseSelect(),
+				PrimaryKey(),
 				bot_data_id
 			)
 		);
diff --git a/common/repositories/template/base_repository.template b/common/repositories/template/base_repository.template
index 5f9cf0c66..a5a8166f6 100644
--- a/common/repositories/template/base_repository.template
+++ b/common/repositories/template/base_repository.template
@@ -105,8 +105,8 @@ public:
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} WHERE {} = {} LIMIT 1",
-				PrimaryKey(),
 				BaseSelect(),
+				PrimaryKey(),
 				{{TABLE_NAME_VAR}}_id
 			)
 		);