diff --git a/compat/pre-3.7/dist/immer.d.ts b/compat/pre-3.7/dist/immer.d.ts
index c4c376a1..afa3ae18 100644
--- a/compat/pre-3.7/dist/immer.d.ts
+++ b/compat/pre-3.7/dist/immer.d.ts
@@ -5,6 +5,8 @@ type Tail<T extends any[]> = ((...t: T) => any) extends (
 	? TT
 	: []
 
+type PrimitiveType = number | string | boolean
+
 /** Object types that should never be mapped */
 type AtomicObject =
 	| Function
@@ -13,11 +15,10 @@ type AtomicObject =
 	| Promise<any>
 	| Date
 	| RegExp
-	| Boolean
-	| Number
-	| String
 
-export type Draft<T> = T extends AtomicObject
+export type Draft<T> = T extends PrimitiveType
+	? T
+	: T extends AtomicObject
 	? T
 	: T extends Map<infer K, infer V>
 	? DraftMap<K, V>
@@ -34,7 +35,9 @@ interface DraftMap<K, V> extends Map<Draft<K>, Draft<V>> {}
 interface DraftSet<V> extends Set<Draft<V>> {}
 
 /** Convert a mutable type into a readonly type */
-export type Immutable<T> = T extends AtomicObject
+export type Immutable<T> = T extends PrimitiveType
+	? T
+	: T extends AtomicObject
 	? T
 	: T extends Map<infer K, infer V> // Ideally, but wait for TS 3.7:    ? Omit<ImmutableMap<K, V>, "set" | "delete" | "clear">
 	? ImmutableMap<K, V>
diff --git a/src/types/types-external.ts b/src/types/types-external.ts
index 0dbd8f86..53a73afa 100644
--- a/src/types/types-external.ts
+++ b/src/types/types-external.ts
@@ -7,15 +7,10 @@ type Tail<T extends any[]> = ((...t: T) => any) extends (
 	? TT
 	: []
 
+type PrimitiveType = number | string | boolean
+
 /** Object types that should never be mapped */
-type AtomicObject =
-	| Function
-	| Promise<any>
-	| Date
-	| RegExp
-	| Boolean
-	| Number
-	| String
+type AtomicObject = Function | Promise<any> | Date | RegExp
 
 /**
  * If the lib "ES2105.collections" is not included in tsconfig.json,
@@ -42,7 +37,9 @@ type WeakReferences = IfAvailable<WeakMap<any, any>> | IfAvailable<WeakSet<any>>
 
 export type WritableDraft<T> = {-readonly [K in keyof T]: Draft<T[K]>}
 
-export type Draft<T> = T extends AtomicObject
+export type Draft<T> = T extends PrimitiveType
+	? T
+	: T extends AtomicObject
 	? T
 	: T extends IfAvailable<ReadonlyMap<infer K, infer V>> // Map extends ReadonlyMap
 	? Map<Draft<K>, Draft<V>>
@@ -55,7 +52,9 @@ export type Draft<T> = T extends AtomicObject
 	: T
 
 /** Convert a mutable type into a readonly type */
-export type Immutable<T> = T extends AtomicObject
+export type Immutable<T> = T extends PrimitiveType
+	? T
+	: T extends AtomicObject
 	? T
 	: T extends IfAvailable<ReadonlyMap<infer K, infer V>> // Map extends ReadonlyMap
 	? ReadonlyMap<Immutable<K>, Immutable<V>>