Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
===================================================================
--- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java	(revision 1772657)
+++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java	(working copy)
@@ -356,21 +356,6 @@
     @Deactivate
     public void deactivate() {
         unregisterNodeStore();
-
-        synchronized (this) {
-            if (observerTracker != null) {
-                observerTracker.stop();
-            }
-            if (gcMonitor != null) {
-                gcMonitor.stop();
-            }
-            segmentNodeStore = null;
-
-            if (store != null) {
-                store.close();
-                store = null;
-            }
-        }
     }
 
     private synchronized void registerNodeStore() throws IOException {
@@ -689,6 +674,21 @@
             executor.stop();
             executor = null;
         }
+
+        synchronized (this) {
+            if (observerTracker != null) {
+                observerTracker.stop();
+            }
+            if (gcMonitor != null) {
+                gcMonitor.stop();
+            }
+            segmentNodeStore = null;
+
+            if (store != null) {
+                store.close();
+                store = null;
+            }
+        }
     }
 
     private File getBaseDirectory() {