diff --git a/services/opentsdb/service.go b/services/opentsdb/service.go
index <HASH>..<HASH> 100644
--- a/services/opentsdb/service.go
+++ b/services/opentsdb/service.go
@@ -177,7 +177,9 @@ func (s *Service) Close() error {
 		return s.ln.Close()
 	}
 
-	s.batcher.Stop()
+	if s.batcher != nil {
+		s.batcher.Stop()
+	}
 	close(s.done)
 	s.wg.Wait()
 	return nil
Only call Stop on non-nil batchers