diff --git a/packages/code-studio/.env.development b/packages/code-studio/.env.development
index 472169fbc2..0a1e9c1f7b 100644
--- a/packages/code-studio/.env.development
+++ b/packages/code-studio/.env.development
@@ -1,7 +1,9 @@
 REACT_APP_ENABLE_LOG_PROXY=false
 REACT_APP_CORE_API_URL=http://localhost:10000/jsapi
-REACT_APP_NOTEBOOKS_URL=http://localhost:10000/notebooks
-REACT_APP_LAYOUTS_URL=http://localhost:10000/layouts
+
+# Proxy set in package.json to handle CORS for other URLs
+# https://create-react-app.dev/docs/proxying-api-requests-in-development/
+
 REACT_APP_ROUTER_BASE_NAME=/
 REACT_APP_INTERNAL_PLUGINS=ExamplePlugin
 PORT=4000
diff --git a/packages/code-studio/package.json b/packages/code-studio/package.json
index 24cea88544..8fc1c43d13 100644
--- a/packages/code-studio/package.json
+++ b/packages/code-studio/package.json
@@ -122,5 +122,6 @@
   ],
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "proxy": "http://localhost:10000"
 }