diff --git a/server/pkg/objstore/plain/store.go b/server/pkg/objstore/plain/store.go
index 6c386dac2..5d58c357e 100644
--- a/server/pkg/objstore/plain/store.go
+++ b/server/pkg/objstore/plain/store.go
@@ -112,7 +112,7 @@ func (s *store) Open(filename string) (out io.ReadSeekCloser, err error) {
 
 func (s *store) Healthcheck(ctx context.Context) error {
 	var (
-		fname = s.namespace + "/.healthcheck"
+		fname = fmt.Sprintf("%s/.healthcheck_%d", s.namespace, time.Now().UnixNano())
 		buf   = &bytes.Buffer{}
 	)
 
diff --git a/server/system/service/service.go b/server/system/service/service.go
index 9ebd31cdd..da3ffd65e 100644
--- a/server/system/service/service.go
+++ b/server/system/service/service.go
@@ -193,12 +193,13 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, ws websock
 				zap.Error(err))
 		}
 
+		hcd.Add(objstore.Healthcheck(DefaultObjectStore), "ObjectStore/System")
+
 		if err != nil {
 			return err
 		}
-	}
 
-	hcd.Add(objstore.Healthcheck(DefaultObjectStore), "ObjectStore/System")
+	}
 
 	DefaultRenderer = Renderer(c.Template)
 	DefaultResourceTranslation = ResourceTranslation()