diff --git a/dependency/vault_pki.go b/dependency/vault_pki.go
index 37bc3d6a8..935be22cf 100644
--- a/dependency/vault_pki.go
+++ b/dependency/vault_pki.go
@@ -98,7 +98,12 @@ func (d *VaultPKIQuery) Fetch(clients *ClientSet, opts *QueryOptions) (interface
 	}
 	select {
 	case dur := <-d.sleepCh:
-		time.Sleep(dur)
+		select {
+		case <-time.After(dur):
+			break
+		case <-d.stopCh:
+			return nil, nil, ErrStopped
+		}
 	default:
 	}
 
diff --git a/dependency/vault_write.go b/dependency/vault_write.go
index 2232d1c79..00c7ed21b 100644
--- a/dependency/vault_write.go
+++ b/dependency/vault_write.go
@@ -61,7 +61,12 @@ func (d *VaultWriteQuery) Fetch(clients *ClientSet, opts *QueryOptions,
 	}
 	select {
 	case dur := <-d.sleepCh:
-		time.Sleep(dur)
+		select {
+		case <-time.After(dur):
+			break
+		case <-d.stopCh:
+			return nil, nil, ErrStopped
+		}
 	default:
 	}