diff --git a/__tests__/base.js b/__tests__/base.js
index c76e359c..473a5853 100644
--- a/__tests__/base.js
+++ b/__tests__/base.js
@@ -2334,6 +2334,18 @@ function runBaseTest(
 				expect(() => m.set("x", 3)).toThrowErrorMatchingSnapshot()
 			})
 
+			it("revokes map proxies for reads that do not go through get", () => {
+				let m
+				produce(baseState, s => {
+					m = s.aMap
+				})
+				const revoked = /has been revoked|minified error nr: 3/
+				expect(() => m.has("jedi")).toThrow(revoked)
+				expect(() => m.size).toThrow(revoked)
+				expect(() => m.keys()).toThrow(revoked)
+				expect(() => m.forEach(() => {})).toThrow(revoked)
+			})
+
 			it("does not draft map keys", () => {
 				// anything else would be terribly confusing
 				const key = {a: 1}
@@ -2638,6 +2650,14 @@ function runBaseTest(
 				expect(() => m.add("x")).toThrowErrorMatchingSnapshot()
 			})
 
+			it("revokes set size reads", () => {
+				let m
+				produce(baseState, s => {
+					m = s.aSet
+				})
+				expect(() => m.size).toThrow(/has been revoked|minified error nr: 3/)
+			})
+
 			it("does support instanceof Set", () => {
 				const set = new Set()
 				produce(set, d => {
diff --git a/src/plugins/mapset.ts b/src/plugins/mapset.ts
index 0cc2158e..c9b21cbe 100644
--- a/src/plugins/mapset.ts
+++ b/src/plugins/mapset.ts
@@ -54,11 +54,15 @@ export function enableMapSet() {
 		}
 
 		get size(): number {
-			return latest(this[DRAFT_STATE]).size
+			const state: MapState = this[DRAFT_STATE]
+			assertUnrevoked(state)
+			return latest(state).size
 		}
 
 		has(key: any): boolean {
-			return latest(this[DRAFT_STATE]).has(key)
+			const state: MapState = this[DRAFT_STATE]
+			assertUnrevoked(state)
+			return latest(state).has(key)
 		}
 
 		set(key: any, value: any) {
@@ -109,6 +113,7 @@ export function enableMapSet() {
 
 		forEach(cb: (value: any, key: any, self: any) => void, thisArg?: any) {
 			const state: MapState = this[DRAFT_STATE]
+			assertUnrevoked(state)
 			latest(state).forEach((_value: any, key: any, _map: any) => {
 				cb.call(thisArg, this.get(key), key, this)
 			})
@@ -132,7 +137,9 @@ export function enableMapSet() {
 		}
 
 		keys(): IterableIterator<any> {
-			return latest(this[DRAFT_STATE]).keys()
+			const state: MapState = this[DRAFT_STATE]
+			assertUnrevoked(state)
+			return latest(state).keys()
 		}
 
 		values(): IterableIterator<any> {
@@ -225,7 +232,9 @@ export function enableMapSet() {
 		}
 
 		get size(): number {
-			return latest(this[DRAFT_STATE]).size
+			const state: SetState = this[DRAFT_STATE]
+			assertUnrevoked(state)
+			return latest(state).size
 		}
 
 		has(value: any): boolean {