diff --git a/extension/popup/popup.js b/extension/popup/popup.js
index 3f9333fd7..9cc4f2da2 100644
--- a/extension/popup/popup.js
+++ b/extension/popup/popup.js
@@ -152,7 +152,11 @@ document.getElementById("activeModeSwitch").addEventListener("click", () => {
 document.getElementById("switchToNoList").addEventListener("click", () => {
 	console.log("Removed from list");
 	if (hostUrl !== undefined) {
-		page.whiteList.removeURLFromLists(hostUrl, cookieStoreId);
+		if(page.contextualIdentitiesEnabled) {
+			page.whiteList.removeURLFromLists(hostUrl, cookieStoreId);
+		} else {
+			page.whiteList.removeURLFromLists(hostUrl, defaultWhiteList);
+		}
 		page.checkIfProtected(activeTab);
 	}
 });
diff --git a/src/services/WhiteListService.js b/src/services/WhiteListService.js
index 903753b43..9aa39fda5 100644
--- a/src/services/WhiteListService.js
+++ b/src/services/WhiteListService.js
@@ -98,6 +98,8 @@ class WhiteListService {
 	removeURLFromLists(url, cookieStoreId = defaultWhiteList) {
 		let otherList = this.returnOtherList(cookieStoreId);
 		// console.log(this.cookieWhiteList);
+		// console.log(url);
+		// console.log(cookieStoreId + " " + otherList);
 		this.cookieWhiteList.get(cookieStoreId).delete(url);
 		this.cookieWhiteList.get(otherList).delete(url);
 	}