diff --git a/src/Core/Utilities/ServiceContainer.cs b/src/Core/Utilities/ServiceContainer.cs
index a1aaebd0a..dba9a5aa2 100644
--- a/src/Core/Utilities/ServiceContainer.cs
+++ b/src/Core/Utilities/ServiceContainer.cs
@@ -102,6 +102,7 @@ namespace Bit.Core.Utilities
         {
             Inited = false;
             RegisteredServices.Clear();
+            RegisteredServices = new Dictionary<string, object>();
         }
     }
 }
diff --git a/src/iOS.Autofill/CredentialProviderViewController.cs b/src/iOS.Autofill/CredentialProviderViewController.cs
index bdce4caee..f738898fe 100644
--- a/src/iOS.Autofill/CredentialProviderViewController.cs
+++ b/src/iOS.Autofill/CredentialProviderViewController.cs
@@ -14,6 +14,7 @@ namespace Bit.iOS.Autofill
     public partial class CredentialProviderViewController : ASCredentialProviderViewController
     {
         private Context _context;
+        private bool _initedHockeyApp;
 
         public CredentialProviderViewController(IntPtr handle)
             : base(handle)
@@ -251,7 +252,11 @@ namespace Bit.iOS.Autofill
             }
             iOSCoreHelpers.RegisterLocalServices();
             ServiceContainer.Init();
-            iOSCoreHelpers.RegisterHockeyApp();
+            if(!_initedHockeyApp)
+            {
+                iOSCoreHelpers.RegisterHockeyApp();
+                _initedHockeyApp = true;
+            }
             iOSCoreHelpers.Bootstrap();
             iOSCoreHelpers.AppearanceAdjustments();
         }
diff --git a/src/iOS.Extension/LoadingViewController.cs b/src/iOS.Extension/LoadingViewController.cs
index 66ef90219..fda391415 100644
--- a/src/iOS.Extension/LoadingViewController.cs
+++ b/src/iOS.Extension/LoadingViewController.cs
@@ -18,6 +18,7 @@ namespace Bit.iOS.Extension
     public partial class LoadingViewController : ExtendedUIViewController
     {
         private Context _context = new Context();
+        private bool _initedHockeyApp;
 
         public LoadingViewController(IntPtr handle)
             : base(handle)
@@ -379,7 +380,11 @@ namespace Bit.iOS.Extension
             }
             iOSCoreHelpers.RegisterLocalServices();
             ServiceContainer.Init();
-            iOSCoreHelpers.RegisterHockeyApp();
+            if(!_initedHockeyApp)
+            {
+                iOSCoreHelpers.RegisterHockeyApp();
+                _initedHockeyApp = true;
+            }
             iOSCoreHelpers.Bootstrap();
             iOSCoreHelpers.AppearanceAdjustments();
         }