diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 3688a6cd46..b96c49e8a0 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -93,6 +93,8 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
 
     DDLogWarn(@"%@ application: didFinishLaunchingWithOptions.", self.tag);
 
+    [AppVersion instance];
+
     // Set the seed the generator for rand().
     //
     // We should always use arc4random() instead of rand(), but we
diff --git a/Signal/src/Models/SyncPushTokensJob.swift b/Signal/src/Models/SyncPushTokensJob.swift
index 1f21878302..c1fb903364 100644
--- a/Signal/src/Models/SyncPushTokensJob.swift
+++ b/Signal/src/Models/SyncPushTokensJob.swift
@@ -42,6 +42,12 @@ class SyncPushTokensJob: NSObject {
                 shouldUploadTokens = true
             }
 
+            Logger.warn("\(self.TAG) lastAppVersion: \(AppVersion.instance().lastAppVersion), currentAppVersion: \(AppVersion.instance().currentAppVersion)")
+            if AppVersion.instance().lastAppVersion != AppVersion.instance().currentAppVersion {
+                Logger.debug("\(self.TAG) Fresh install or app upgrade.")
+                shouldUploadTokens = true
+            }
+
             guard shouldUploadTokens else {
                 Logger.warn("\(self.TAG) Skipping push token upload. pushToken: \(pushToken), voipToken: \(voipToken)")
                 return Promise(value: ())
diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h
index dce5e82cad..c0750df5f9 100644
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@@ -35,6 +35,7 @@
 #import <JSQMessagesViewController/UIColor+JSQMessages.h>
 #import <JSQSystemSoundPlayer.h>
 #import <PureLayout/PureLayout.h>
+#import <SignalServiceKit/AppVersion.h>
 #import <SignalServiceKit/Contact.h>
 #import <SignalServiceKit/ContactsUpdater.h>
 #import <SignalServiceKit/Cryptography.h>