Recommended fixes

2 files changed, 3 insertions, 2 deletions

diff --git a/SmartDeviceLink/SDLEncryptionLifecycleManager.h b/SmartDeviceLink/SDLEncryptionLifecycleManager.h
index 7c4eb7c58..cd6da8656 100644
--- a/SmartDeviceLink/SDLEncryptionLifecycleManager.h
+++ b/SmartDeviceLink/SDLEncryptionLifecycleManager.h
@@ -7,12 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "SDLProtocol.h"
 #import "SDLConnectionManagerType.h"
 #import "SDLProtocolListener.h"
 
 @class SDLStateMachine;
 @class SDLEncryptionConfiguration;
+@class SDLProtocol;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SmartDeviceLink/SDLEncryptionLifecycleManager.m b/SmartDeviceLink/SDLEncryptionLifecycleManager.m
index cc5e0b181..99e5574cd 100644
--- a/SmartDeviceLink/SDLEncryptionLifecycleManager.m
+++ b/SmartDeviceLink/SDLEncryptionLifecycleManager.m
@@ -17,6 +17,7 @@
 #import "SDLOnPermissionsChange.h"
 #import "SDLPermissionItem.h"
 #import "SDLPermissionConstants.h"
+#import "SDLProtocol.h"
 #import "SDLError.h"
 
 @interface SDLEncryptionLifecycleManager() <SDLProtocolListener>
@@ -205,7 +206,7 @@
     // if startWithProtocol has not been called yet, abort here
     if (!self.protocol  || ![self.currentHMILevel isEqualToEnum:SDLHMILevelNone]) { return; }
     
-    if (!self.isEncryptionReady) {
+    if (![self.encryptionStateMachine isCurrentState:SDLEncryptionLifecycleManagerStateStarting] && self.isEncryptionReady) {
         [self sdl_startEncryptionService];
     }
 }