diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp
index 8c782a05ef74..5e129ed674f6 100644
--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -577,6 +577,8 @@ nsGeolocation::nsGeolocation(nsIDOMWindow* aContentDom)
 
 nsGeolocation::~nsGeolocation()
 {
+  if (mService)
+    Shutdown();
 }
 
 void