diff --git a/scripts/SettingsController.js b/scripts/SettingsController.js
index 5ea8a91..fac65c3 100644
--- a/scripts/SettingsController.js
+++ b/scripts/SettingsController.js
@@ -132,7 +132,9 @@ angular.module('flashy.SettingsController', ['ui.router']).
                                 // and notifications will stop
                                 // This just may be in a bad state when the user returns
                                 pushSwitch.checked = true;
-                                console.error('We were unable to unregister from push');
+                                removeSubscription(pushSubscription);
+                                console.error('We were unable to unregister from push, but we removed'+
+                                'registration id from the server');
                             }
 
                         }).catch(function(e) {