diff --git a/ui/config/targets.js b/ui/config/targets.js
index f14319316dff..9f6cc639666e 100644
--- a/ui/config/targets.js
+++ b/ui/config/targets.js
@@ -2,13 +2,6 @@
 
 const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
-
 module.exports = {
   browsers,
 };
diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js
index 595c412663ee..5b4d0eb85e27 100644
--- a/ui/ember-cli-build.js
+++ b/ui/ember-cli-build.js
@@ -17,6 +17,7 @@ module.exports = function(defaults) {
       modes: ['javascript'],
     },
     babel: {
+      include: ['proposal-optional-chaining'],
       plugins: [
         '@babel/plugin-proposal-object-rest-spread',
         require.resolve('ember-auto-import/babel-plugin'),