diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 312da5e39..c0b11bdcd 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -61,7 +61,6 @@ static NSTimeInterval launchStartedAt;
 
 // Debug settings
 static BOOL isInternalTestVersion = NO;
-static BOOL isUsingFullAPNs = YES;
 
 @interface AppDelegate () <UNUserNotificationCenterDelegate>
 
@@ -589,12 +588,10 @@ static BOOL isUsingFullAPNs = YES;
     }
 
     OWSLogInfo(@"Registered for push notifications with token: %@.", deviceToken);
+    BOOL isUsingFullAPNs = [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
     if (isUsingFullAPNs) {
         [LKPushNotificationManager registerWithToken:deviceToken hexEncodedPublicKey:self.tsAccountManager.localNumber];
-    } else {
-        [LKPushNotificationManager registerWithToken:deviceToken];
     }
-//    [self.pushRegistrationManager didReceiveVanillaPushToken:deviceToken];
 }
 
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
@@ -709,6 +706,7 @@ static BOOL isUsingFullAPNs = YES;
 
 - (void)enableBackgroundRefreshIfNecessary
 {
+    BOOL isUsingFullAPNs = [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
     if (isUsingFullAPNs) { return; }
     [AppReadiness runNowOrWhenAppDidBecomeReady:^{
         [UIApplication.sharedApplication setMinimumBackgroundFetchInterval:UIApplicationBackgroundFetchIntervalMinimum];
diff --git a/Signal/src/Loki/View Controllers/PNModeVC.swift b/Signal/src/Loki/View Controllers/PNModeVC.swift
index d9330256c..dd82f36fa 100644
--- a/Signal/src/Loki/View Controllers/PNModeVC.swift	
+++ b/Signal/src/Loki/View Controllers/PNModeVC.swift	
@@ -87,6 +87,7 @@ final class PNModeVC : BaseVC, OptionViewDelegate {
     }
 
     @objc private func register() {
+        UserDefaults.standard[.isUsingFullAPNs] = (selectedOptionView == apnsOptionView)
         TSAccountManager.sharedInstance().didRegister()
         let homeVC = HomeVC()
         navigationController!.setViewControllers([ homeVC ], animated: true)