diff --git a/server.cpp b/server.cpp
index 37a368f..d3f0254 100644
--- a/server.cpp
+++ b/server.cpp
@@ -28,7 +28,7 @@ int main()
 	CROW_ROUTE(app, "/categories")([](){
 		crow::json::wvalue entries;
 
-		ResultSet *res = stmt->executeQuery("SELECT practice_categories.id, practice_categories.name AS category, instruments.name AS instrument FROM practice_categories JOIN instruments ON practice_categories.instrument_id = instruments.id ORDER BY practice_categories.id ASC");
+		ResultSet *res = stmt->executeQuery("SELECT practice_categories.id, practice_categories.name AS category, instruments.name AS instrument FROM practice_categories JOIN instruments ON practice_categories.instrument_id = instruments.id ORDER BY instruments.name ASC, category ASC");
 
 		int i = 0;
 		while (res->next()) {