diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m
index 41a7e0cd74..56f307c398 100644
--- a/Classes/BITUpdateManager.m
+++ b/Classes/BITUpdateManager.m
@@ -390,6 +390,10 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
 #pragma mark - BetaUpdateUI
 
 - (BITUpdateViewController *)hockeyViewController:(BOOL)modal {
+  if ([self isAppStoreEnvironment]) {
+    NSLog(@"[HockeySDK] This should not be called from an app store build!");
+    return nil;
+  }
   return [[BITUpdateViewController alloc] initWithModalStyle:modal];
 }
 
@@ -542,6 +546,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
 }
 
 - (void)checkForUpdateShowFeedback:(BOOL)feedback {
+  if ([self isAppStoreEnvironment]) return;
   if (self.isCheckInProgress) return;
   
   _showFeedback = feedback;