diff --git a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
index e1d3aee92..32f1d18e2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
@@ -15,6 +15,7 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 
 import com.facebook.Session;
+import com.timsu.astrid.GCMIntentService;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
@@ -131,6 +132,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                         }
 
                         AstridPreferences.setPreferenceDefaults();
+                        GCMIntentService.unregister(OldTaskPreferences.this);
 
                         System.exit(0);
                     }