1 files changed, 7 insertions, 1 deletions

diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx
index 05375d352..9e61cdd78 100644
--- a/src/containers/settings/EditServiceScreen.tsx
+++ b/src/containers/settings/EditServiceScreen.tsx
@@ -344,7 +344,13 @@ class EditServiceScreen extends Component<IProps> {
 
     if (proxy.isEnabled) {
       const serviceProxyConfig: IProxyConfig = service
-        ? stores.settings.proxy[service.id]
+        ? /*
+          TODO - [TS DEBT] find out why sometimes proxy[service.id] gives undefined
+          Note in proxy service id exist as key but value is undefined rather that proxy empty object
+
+          Temp fix - or-ed {} (to stores.settings.proxy[service.id] ) to avoid undefined proxy in settingStore throw error
+          */
+          stores.settings.proxy[service.id] || {}
         : {};
 
       config.fields.proxy = {