diff --git a/core/state-manager.js b/core/state-manager.js
index 6a4c7987d077ce74c13c0d8e3da5ef6a57949e63..2728d0a48a3e38533ffbc66655d6ff5c9cbaea85 100644
--- a/core/state-manager.js
+++ b/core/state-manager.js
@@ -262,8 +262,14 @@ chrome.webRequest.onBeforeRedirect.addListener(function (requestDetails) {
 
 }, {'urls': [Address.ANY]});
 
-chrome.webRequest.onBeforeSendHeaders.addListener(stateManager._stripMetadata, {
-    'urls': stateManager.validHosts
-}, [WebRequest.BLOCKING, WebRequest.HEADERS]);
+chrome.storage.local.get({'stripMetadata': true}, function (options) {
+
+    if (options === null || options.stripMetadata !== false) {
+
+        chrome.webRequest.onBeforeSendHeaders.addListener(stateManager._stripMetadata, {
+            'urls': stateManager.validHosts
+        }, [WebRequest.BLOCKING, WebRequest.HEADERS]);
+    }
+});
 
 chrome.storage.onChanged.addListener(stateManager._handleStorageChanged);