diff --git a/src/lib/services/proxy-service.ts b/src/lib/services/proxy-service.ts
index 2226e0c610..1783d0d71c 100644
--- a/src/lib/services/proxy-service.ts
+++ b/src/lib/services/proxy-service.ts
@@ -86,7 +86,7 @@ export class ProxyService {
 
         return definitions.map((feature) => ({
             name: feature.name,
-            enabled: Boolean(client.isEnabled(feature.name)),
+            enabled: Boolean(client.isEnabled(feature.name, context)),
             variant: client.forceGetVariant(feature.name, context),
             impressionData: Boolean(feature.impressionData),
         }));
diff --git a/src/test/e2e/api/proxy/proxy.e2e.test.ts b/src/test/e2e/api/proxy/proxy.e2e.test.ts
index 6eea64a0e8..0a7bfe8267 100644
--- a/src/test/e2e/api/proxy/proxy.e2e.test.ts
+++ b/src/test/e2e/api/proxy/proxy.e2e.test.ts
@@ -14,7 +14,6 @@ import {
     IStrategyConfig,
 } from '../../../../lib/types';
 import { ProxyRepository } from '../../../../lib/proxy';
-import * as process from 'process';
 
 let app: IUnleashTest;
 let db: ITestDb;
@@ -1002,6 +1001,7 @@ test('should return all features when specified', async () => {
                 ],
             });
         });
+    process.env.RETURN_ALL_TOGGLES = 'false';
 });
 
 test('should return all features when env var is set only', async () => {