diff --git a/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/NoResult/NoResultScreenViewController.swift b/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/NoResult/NoResultScreenViewController.swift
index 446c6a674..fedcb1387 100644
--- a/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/NoResult/NoResultScreenViewController.swift
+++ b/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/NoResult/NoResultScreenViewController.swift
@@ -30,19 +30,6 @@ final class NoResultScreenViewController: UIViewController {
                 return text
             }
         }
-
-        var analyticsValue: String {
-            switch self {
-            case .pdf:
-                return "pdf"
-            case .image:
-                return "image"
-            case .qrCode:
-                return "qrCode"
-            default:
-                return "unknown"
-            }
-        }
     }
 
     lazy var tableView: UITableView = {
@@ -125,8 +112,8 @@ final class NoResultScreenViewController: UIViewController {
         super.viewDidLoad()
         self.setupView()
 
-        let eventProperties = [AnalyticsProperty(key: .noResultType,
-                                                 value: type.analyticsValue)]
+        let eventProperties = [AnalyticsProperty(key: .documentType,
+                                                 value: AnalyticsMapper.documentTypeAnalytics(from: type))]
         AnalyticsManager.trackScreenShown(screenName: .noResults,
                                           properties: eventProperties)
     }
diff --git a/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/Screen API Coordinator/GiniScreenAPICoordinator+Analysis.swift b/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/Screen API Coordinator/GiniScreenAPICoordinator+Analysis.swift
index 1c9f53e31..97e154678 100644
--- a/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/Screen API Coordinator/GiniScreenAPICoordinator+Analysis.swift	
+++ b/CaptureSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/Screen API Coordinator/GiniScreenAPICoordinator+Analysis.swift	
@@ -140,8 +140,7 @@ extension GiniScreenAPICoordinator: AnalysisDelegate {
         let viewController = ErrorScreenViewController(giniConfiguration: giniConfiguration,
                                                        type: errorType,
                                                        documentType: pages.type ?? .pdf,
-                                                       viewModel: viewModel, 
-                                                       errorAnalytics: ErrorAnalytics(type: ""))
+                                                       viewModel: viewModel)
 
         screenAPINavigationController.pushViewController(viewController, animated: animated)
     }