diff --git a/cms/envs/bok_choy.env.json b/cms/envs/bok_choy.env.json
index d9856eec73..98dfbd0fd1 100644
--- a/cms/envs/bok_choy.env.json
+++ b/cms/envs/bok_choy.env.json
@@ -104,5 +104,9 @@
     "THEME_NAME": "",
     "TIME_ZONE": "America/New_York",
     "WIKI_ENABLED": true,
-    "OAUTH_OIDC_ISSUER": "https://www.example.com/oauth2"
+    "OAUTH_OIDC_ISSUER": "https://www.example.com/oauth2",
+    "DEPRECATED_BLOCK_TYPES": [
+        "poll",
+        "survey"
+    ]
 }
diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py
index 765920aba1..ff95191919 100644
--- a/cms/envs/bok_choy.py
+++ b/cms/envs/bok_choy.py
@@ -96,6 +96,9 @@ FEATURES['ENABLE_VIDEO_BUMPER'] = True  # Enable video bumper in Studio settings
 # Enable partner support link in Studio footer
 FEATURES['PARTNER_SUPPORT_EMAIL'] = 'partner-support@example.com'
 
+# Disable some block types to test block deprecation logic
+DEPRECATED_BLOCK_TYPES = ['poll', 'survey']
+
 ########################### Entrance Exams #################################
 FEATURES['ENTRANCE_EXAMS'] = True