diff --git a/client/fingerprint_manager.go b/client/fingerprint_manager.go
index 713189604..74b75bafd 100644
--- a/client/fingerprint_manager.go
+++ b/client/fingerprint_manager.go
@@ -100,7 +100,12 @@ func (fm *FingerprintManager) setupDrivers(drivers []string) error {
 func (fm *FingerprintManager) fingerprint(name string, f fingerprint.Fingerprint) (bool, error) {
 	request := &cstructs.FingerprintRequest{Config: fm.getConfig(), Node: fm.node}
 	var response cstructs.FingerprintResponse
-	if err := f.Fingerprint(request, &response); err != nil {
+
+	fm.nodeLock.Lock()
+	err := f.Fingerprint(request, &response)
+	fm.nodeLock.Unlock()
+
+	if err != nil {
 		return false, err
 	}