diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua
index 367ddbf4df..be071d1778 100644
--- a/src/Modules/CalcSetup.lua
+++ b/src/Modules/CalcSetup.lua
@@ -944,10 +944,10 @@ function calcs.initEnv(build, mode, override, specEnv)
 				else
 					for _, socketGroup in pairs(build.skillsTab.socketGroupList) do
 						-- Look for other groups that are socketed in the item
-						if socketGroup.slot == grantedSkill.slotName and not socketGroup.source then
+						if socketGroup.slot == grantedSkill.slotName and not socketGroup.source and socketGroup.enabled then
 							-- Add all support gems to the skill's group
 							for _, gemInstance in ipairs(socketGroup.gemList) do
-								if gemInstance.gemData and gemInstance.gemData.grantedEffect.support then
+								if gemInstance.gemData and (gemInstance.gemData.grantedEffect.support or (gemInstance.gemData.secondaryGrantedEffect and gemInstance.gemData.secondaryGrantedEffect.support)) then
 									t_insert(group.gemList, gemInstance)
 								end
 							end