diff --git a/Classes/BITHockeyHelper.m b/Classes/BITHockeyHelper.m
index e866ca6e1a..f1c246e040 100644
--- a/Classes/BITHockeyHelper.m
+++ b/Classes/BITHockeyHelper.m
@@ -87,6 +87,9 @@ NSString *bit_appName(void) {
   if (!appName)
     appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: BITHockeyLocalizedString(@"HockeyFeedbackActivityAppPlaceholder");
 
+  if (!appName)
+    appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+  
   return appName;
 }
 
diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m
index 3545cb7ab2..b7a752d2e4 100644
--- a/Classes/BITUpdateManager.m
+++ b/Classes/BITUpdateManager.m
@@ -940,7 +940,7 @@
     // populate with default values (if empty)
     if (![anAppVersions count]) {
       BITAppVersionMetaInfo *defaultApp = [[[BITAppVersionMetaInfo alloc] init] autorelease];
-      defaultApp.name = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+      defaultApp.name = bit_appName();
       defaultApp.version = _currentAppVersion;
       defaultApp.shortVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
       _appVersions = [[NSArray arrayWithObject:defaultApp] retain];