diff --git a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/build.gradle b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/build.gradle
index b25ea9f9..b9531077 100644
--- a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/build.gradle
+++ b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/build.gradle
@@ -27,7 +27,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.polarofficial:polar-ble-sdk:5.0.1'
+    implementation 'com.github.polarofficial:polar-ble-sdk:5.0.2'
     implementation 'com.androidplot:androidplot-core:1.5.10'
     implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
diff --git a/examples/example-android/androidBleSdkTestApp/app/build.gradle b/examples/example-android/androidBleSdkTestApp/app/build.gradle
index 853104a5..8e5ac106 100644
--- a/examples/example-android/androidBleSdkTestApp/app/build.gradle
+++ b/examples/example-android/androidBleSdkTestApp/app/build.gradle
@@ -27,7 +27,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.polarofficial:polar-ble-sdk:5.0.1'
+    implementation 'com.github.polarofficial:polar-ble-sdk:5.0.2'
     implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
     implementation 'androidx.appcompat:appcompat:1.6.1'
diff --git a/examples/example-ios/iosBleSdkTestApp/Podfile b/examples/example-ios/iosBleSdkTestApp/Podfile
index ba0a14c4..491eb77f 100644
--- a/examples/example-ios/iosBleSdkTestApp/Podfile
+++ b/examples/example-ios/iosBleSdkTestApp/Podfile
@@ -4,5 +4,5 @@ platform :ios, '15.0'
 use_frameworks!
 
 target 'iosBleSdkTestApp' do
-    pod 'PolarBleSdk', '5.0.1'
+    pod 'PolarBleSdk', '5.0.2'
 end
diff --git a/examples/example-ios/iosBleSdkTestApp/Podfile.lock b/examples/example-ios/iosBleSdkTestApp/Podfile.lock
index 9ad5b4e9..438900b7 100644
--- a/examples/example-ios/iosBleSdkTestApp/Podfile.lock
+++ b/examples/example-ios/iosBleSdkTestApp/Podfile.lock
@@ -1,12 +1,12 @@
 PODS:
-  - PolarBleSdk (5.0.1):
+  - PolarBleSdk (5.0.2):
     - RxSwift (~> 6.5.0)
     - SwiftProtobuf (~> 1.0)
   - RxSwift (6.5.0)
   - SwiftProtobuf (1.21.0)
 
 DEPENDENCIES:
-  - PolarBleSdk (= 5.0.1)
+  - PolarBleSdk (= 5.0.2)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
@@ -15,10 +15,10 @@ SPEC REPOS:
     - SwiftProtobuf
 
 SPEC CHECKSUMS:
-  PolarBleSdk: 560c457a9d8293a25d397046e1510d8b4b7d90ce
+  PolarBleSdk: 5d1d9792a1fee9d5b4f26f7c54a7eb57988d5d3e
   RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
   SwiftProtobuf: afced68785854575756db965e9da52bbf3dc45e7
 
-PODFILE CHECKSUM: e0754e2bc135316564248b49311722c1a2db0a71
+PODFILE CHECKSUM: 03f19b71504ae65c395fd213b6e571e4cb68c2d1
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Manifest.lock b/examples/example-ios/iosBleSdkTestApp/Pods/Manifest.lock
index 9ad5b4e9..438900b7 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Manifest.lock
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Manifest.lock
@@ -1,12 +1,12 @@
 PODS:
-  - PolarBleSdk (5.0.1):
+  - PolarBleSdk (5.0.2):
     - RxSwift (~> 6.5.0)
     - SwiftProtobuf (~> 1.0)
   - RxSwift (6.5.0)
   - SwiftProtobuf (1.21.0)
 
 DEPENDENCIES:
-  - PolarBleSdk (= 5.0.1)
+  - PolarBleSdk (= 5.0.2)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
@@ -15,10 +15,10 @@ SPEC REPOS:
     - SwiftProtobuf
 
 SPEC CHECKSUMS:
-  PolarBleSdk: 560c457a9d8293a25d397046e1510d8b4b7d90ce
+  PolarBleSdk: 5d1d9792a1fee9d5b4f26f7c54a7eb57988d5d3e
   RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
   SwiftProtobuf: afced68785854575756db965e9da52bbf3dc45e7
 
-PODFILE CHECKSUM: e0754e2bc135316564248b49311722c1a2db0a71
+PODFILE CHECKSUM: 03f19b71504ae65c395fd213b6e571e4cb68c2d1
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Pods.xcodeproj/project.pbxproj b/examples/example-ios/iosBleSdkTestApp/Pods/Pods.xcodeproj/project.pbxproj
index 809d9828..835536ae 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Pods.xcodeproj/project.pbxproj
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Pods.xcodeproj/project.pbxproj
@@ -1381,8 +1381,8 @@
 		BFDFE7DC352907FC980B868725387E98 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1240;
-				LastUpgradeCheck = 1240;
+				LastSwiftUpdateCheck = 1300;
+				LastUpgradeCheck = 1300;
 			};
 			buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 10.0";
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/api/PolarBleApiDefaultImpl.swift b/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/api/PolarBleApiDefaultImpl.swift
index d3ea85e7..d76011a3 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/api/PolarBleApiDefaultImpl.swift
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/api/PolarBleApiDefaultImpl.swift
@@ -18,6 +18,6 @@ public class PolarBleApiDefaultImpl {
     ///
     /// - Returns: version in format major.minor.patch
     public static func versionInfo() -> String {
-        return "5.0.1"
+        return "5.0.2"
     }
 }
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/impl/PolarBleApiImpl.swift b/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/impl/PolarBleApiImpl.swift
index f67b74c4..64bff56d 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/impl/PolarBleApiImpl.swift
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/PolarBleSdk/sources/iOS/ios-communications/Sources/PolarBleSdk/sdk/impl/PolarBleApiImpl.swift
@@ -1080,6 +1080,7 @@ extension PolarBleApiImpl: PolarBleApi  {
             .map { (entry) -> PolarOfflineRecordingEntry in
                 let components = entry.name.split(separator: "/")
                 let dateFormatter = DateFormatter()
+                dateFormatter.locale = Locale(identifier: "en_US_POSIX")
                 dateFormatter.dateFormat = "yyyyMMddHHmmss"
                 
                 guard let date = dateFormatter.date(from: String(components[2] + components[4])) else {
@@ -1508,6 +1509,7 @@ extension PolarBleApiImpl: PolarBleApi  {
                 .map { (entry) -> (path: String, date: Date, entryId: String) in
                     let components = entry.name.split(separator: "/")
                     let dateFormatter = DateFormatter()
+                    dateFormatter.locale = Locale(identifier: "en_US_POSIX")
                     dateFormatter.dateFormat = "yyyyMMddHHmmss"
                     if let date = dateFormatter.date(from: String(components[2] + components[4])) {
                         return (entry.name, date: date, entryId: String(components[2] + components[4]))
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/Pods-iosBleSdkTestApp/Pods-iosBleSdkTestApp-Info.plist b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/Pods-iosBleSdkTestApp/Pods-iosBleSdkTestApp-Info.plist
index 2243fe6e..19cf209d 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/Pods-iosBleSdkTestApp/Pods-iosBleSdkTestApp-Info.plist	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/Pods-iosBleSdkTestApp/Pods-iosBleSdkTestApp-Info.plist	
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
+  <string>${PODS_DEVELOPMENT_LANGUAGE}</string>
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk-Info.plist b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk-Info.plist
index 8d87a1ae..558ae168 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk-Info.plist	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk-Info.plist	
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
+  <string>${PODS_DEVELOPMENT_LANGUAGE}</string>
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>5.0.1</string>
+  <string>5.0.2</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.debug.xcconfig b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.debug.xcconfig
index 14cdb7be..3b99c576 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.debug.xcconfig	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.debug.xcconfig	
@@ -7,6 +7,7 @@ OTHER_LDFLAGS = $(inherited) -framework "RxSwift" -framework "SwiftProtobuf"
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/PolarBleSdk
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.release.xcconfig b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.release.xcconfig
index 14cdb7be..3b99c576 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.release.xcconfig	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/PolarBleSdk/PolarBleSdk.release.xcconfig	
@@ -7,6 +7,7 @@ OTHER_LDFLAGS = $(inherited) -framework "RxSwift" -framework "SwiftProtobuf"
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/PolarBleSdk
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift-Info.plist b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift-Info.plist
index 891b3754..ff0337dd 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift-Info.plist	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift-Info.plist	
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
+  <string>${PODS_DEVELOPMENT_LANGUAGE}</string>
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.debug.xcconfig b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.debug.xcconfig
index 6baebfc1..f6cc0fae 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.debug.xcconfig	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.debug.xcconfig	
@@ -5,6 +5,7 @@ LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFOR
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/RxSwift
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.release.xcconfig b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.release.xcconfig
index 6baebfc1..f6cc0fae 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.release.xcconfig	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/RxSwift/RxSwift.release.xcconfig	
@@ -5,6 +5,7 @@ LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFOR
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/RxSwift
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf-Info.plist b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf-Info.plist
index cc9cc521..41a7a638 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf-Info.plist	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf-Info.plist	
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
+  <string>${PODS_DEVELOPMENT_LANGUAGE}</string>
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.debug.xcconfig b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.debug.xcconfig
index fc81198f..997d43e9 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.debug.xcconfig	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.debug.xcconfig	
@@ -5,6 +5,7 @@ LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFOR
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/SwiftProtobuf
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
diff --git a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.release.xcconfig b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.release.xcconfig
index fc81198f..997d43e9 100644
--- a/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.release.xcconfig	
+++ b/examples/example-ios/iosBleSdkTestApp/Pods/Target Support Files/SwiftProtobuf/SwiftProtobuf.release.xcconfig	
@@ -5,6 +5,7 @@ LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFOR
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/SwiftProtobuf
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
diff --git a/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OfflineRecording/OfflineRecordingStartView.swift b/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OfflineRecording/OfflineRecordingStartView.swift
index 75aa2c64..60a9be45 100644
--- a/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OfflineRecording/OfflineRecordingStartView.swift
+++ b/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OfflineRecording/OfflineRecordingStartView.swift
@@ -21,9 +21,8 @@ struct OfflineRecordingStartView: View {
                         OfflineRecStartButton(dataType: .hr)
                     }
                 }.fullScreenCover(item: $bleSdkManager.offlineRecordingSettings) { offlineRecSettings in
-                    if let settings = offlineRecSettings {
-                        SettingsView(streamedFeature: settings.feature, streamSettings: settings, isOfflineSettings: true)
-                    }
+                    let settings = offlineRecSettings
+                    SettingsView(streamedFeature: settings.feature, streamSettings: settings, isOfflineSettings: true)
                 }
             }.task {
                 await bleSdkManager.getOfflineRecordingStatus()
diff --git a/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OnlineStreaming/OnlineStreamsView.swift b/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OnlineStreaming/OnlineStreamsView.swift
index a7292ea7..c9ad654e 100644
--- a/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OnlineStreaming/OnlineStreamsView.swift
+++ b/examples/example-ios/iosBleSdkTestApp/iosBleSdkTestApp/Views/OnlineStreaming/OnlineStreamsView.swift
@@ -30,9 +30,8 @@ struct OnlineStreamsView: View {
                 }
             }
             .fullScreenCover(item: $bleSdkManager.onlineStreamSettings) { streamSettings in
-                if let settings = streamSettings {
-                    SettingsView(streamedFeature: settings.feature, streamSettings: settings)
-                }
+                let settings = streamSettings
+                SettingsView(streamedFeature: settings.feature, streamSettings: settings)
             }
             .sheet(
                 item: Binding(