diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 7593ef7..fd2ff5c 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -188,13 +188,13 @@ window.assignManager = {
     // The following blocks potentially dangerous requests for privacy that come without a tabId
 
     if(requestInfo.tabId === -1) {
-      return {type: "direct"};
+      return {};
     }
 
     const tab = await browser.tabs.get(requestInfo.tabId);
     const result = await proxifiedContainers.retrieve(tab.cookieStoreId);
     if (!result || !result.proxy) {
-      return {type: "direct"};
+      return {};
     }
 
     if (!result.proxy.mozProxyEnabled) {
diff --git a/src/js/popup.js b/src/js/popup.js
index 171b215..0b82f7f 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1582,7 +1582,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
         this.mozProxyEnabledInput.value = proxyInfo.mozProxyEnabled;
         this.proxyAddressInput.value = `${proxyInfo.type}://${proxyInfo.host}:${proxyInfo.port}`;
 
-        if (typeof(proxyInfo.countryCode) === "undefined" && proxyInfo.type !== "direct") {
+        if (typeof(proxyInfo.countryCode) === "undefined" && proxyInfo.type) {
           // Set custom proxy URL below 'Advanced proxy settings' button label
           this.advancedProxyAddress.textContent = `${proxyInfo.type}://${proxyInfo.host}:${proxyInfo.port}`;
         }
@@ -1948,7 +1948,7 @@ Logic.registerPanel(P_ADVANCED_PROXY_SETTINGS, {
     };
 
     const edit_proxy_dom = function(proxy) {
-      if (proxy.type === "direct" || typeof proxy.type === "undefined" || MozillaVPN.proxyIsDisabled(proxy)) {
+      if (!proxy.type || MozillaVPN.proxyIsDisabled(proxy)) {
         resetProxyInput();
         return;
       }
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index ba8c73c..241c86b 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -51,7 +51,7 @@ proxifiedContainers = {
     }
 
     if (mozillaVpnData && mozillaVpnData.mozProxyEnabled === undefined) {
-      matches.groups.type = "direct";
+      matches.groups.type = null;
     }
 
     if (!mozillaVpnData) {