diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index e0c1b6099..b3759a6b7 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -180,7 +180,10 @@ const api = {
 			stub.renderer = stub.renderer || undefined; // Clear empty strings
 			stub = _.defaults(stub, DEFAULT_BREW_LOAD); // Fill in blank fields
 
-			req.brew = stub;
+			
+
+			const fixedStub = migrateSystemsToTags(stub);
+			req.brew = fixedStub;
 			next();
 		};
 	},