--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -572,16 +572,18 @@ nsGeolocation::nsGeolocation(nsIDOMWindo
 
   mService = nsGeolocationService::GetInstance();
   if (mService)
     mService->AddLocator(this);
 }
 
 nsGeolocation::~nsGeolocation()
 {
+  if (mService)
+    Shutdown();
 }
 
 void
 nsGeolocation::Shutdown()
 {
   // Shutdown and release all callbacks
   for (PRUint32 i = 0; i< mPendingCallbacks.Length(); i++)
     mPendingCallbacks[i]->Shutdown();