diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.m b/OHHTTPStubs/Sources/OHHTTPStubs.m
index a8dbe4cd..c9e1d091 100644
--- a/OHHTTPStubs/Sources/OHHTTPStubs.m
+++ b/OHHTTPStubs/Sources/OHHTTPStubs.m
@@ -44,7 +44,7 @@ @interface OHHTTPStubsProtocol : NSURLProtocol @end
 @interface OHHTTPStubs()
 + (instancetype)sharedInstance;
 @property(atomic, copy) NSMutableArray* stubDescriptors;
-@property(atomic, copy) NSNumber* enabledStateNumber;
+@property(atomic, assign) BOOL enabledState;
 @property(atomic, copy, nullable) void (^onStubActivationBlock)(NSURLRequest*, id<OHHTTPStubsDescriptor>);
 @end
 
@@ -115,7 +115,7 @@ - (instancetype)init
     if (self)
     {
         _stubDescriptors = [NSMutableArray array];
-        _enabledStateNumber = @YES; // assume initialize has already been run
+        _enabledState = YES; // assume initialize has already been run
     }
     return self;
 }
@@ -248,7 +248,7 @@ -(BOOL)isEnabled
     BOOL enabled = NO;
     @synchronized(self)
     {
-        enabled = _enabledStateNumber.boolValue;
+        enabled = _enabledState;
     }
     return enabled;
 }
@@ -257,8 +257,8 @@ -(void)setEnabled:(BOOL)enable
 {
     @synchronized(self)
     {
-        _enabledStateNumber = @(enable);
-        [self.class _setEnable:enable];
+        _enabledState = enable;
+        [self.class _setEnable:_enabledState];
     }
 }