diff --git a/conf/firefox-forbidden-policies.js b/conf/firefox-forbidden-policies.js
index 247897d1..0b688ca3 100644
--- a/conf/firefox-forbidden-policies.js
+++ b/conf/firefox-forbidden-policies.js
@@ -106,5 +106,8 @@ lockPref("sidebar.revamp", true);
 lockPref("sidebar.verticalTabs", true);
 lockPref("sidebar.visibility", "always-show");
 
+// Tab groups. TODO: Are these allowed? I am on ESR, so it does nothing yet.
+lockPref("browser.tabs.groups.enabled", true);
+
 // No making configuration on the last line of the file!
 //
diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index 7fd4b9a4..cf5c968a 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -450,6 +450,12 @@
 				"Type": "boolean",
 				"Value": false
 			},
+			"browser.tabs.groups.enabled": {
+				"Comment": "TODO: Is this allowed when it lands?",
+				"Status": "default",
+				"Type": "boolean",
+				"Value": true
+			},
 			"browser.tabs.inTitlebar": {
 				"Status": "default",
 				"Type": "number",