diff --git a/single.php b/single.php
index 12c1d86..b6eaa6e 100644
--- a/single.php
+++ b/single.php
@@ -153,7 +153,13 @@ function eqd_single_after_entry_content() {
 									<th class="sr-only" scope="row"><?php echo esc_html( get_sub_field( 'company_name' ) ); ?></th>
 									<td>
 										<div class="td_content">
-											<img src="<?php echo wp_kses_post( $logo['url'] ); ?>" alt="<?php echo wp_kses_post( $logo['alt'] ); ?>">
+											<?php if ( $url ) { ?>
+												<a href="<?php echo wp_kses_post( $url['url'] ); ?>" <?php echo ! empty( $url['target'] ) ? wp_kses_post( "target='" . $url['target'] . "'" ) : ''; ?>>
+											<?php } ?>
+												<img src="<?php echo wp_kses_post( $logo['url'] ); ?>" alt="<?php echo wp_kses_post( $logo['alt'] ); ?>">
+											<?php if ( $url ) { ?>
+												</a>
+											<?php } ?>
 											<button class="btn-text modal-btn" data-modal="modal_disclosure_<?php echo wp_kses_post( get_row_index() ); ?>" aria-label="Disclosures for <?php echo wp_kses_post( $company_name ); ?>">Disclosures</button>
 										</div>
 									</td>
diff --git a/template-parts/blocks/vendor-repeater/template.php b/template-parts/blocks/vendor-repeater/template.php
index 344d83e..29bc0b8 100644
--- a/template-parts/blocks/vendor-repeater/template.php
+++ b/template-parts/blocks/vendor-repeater/template.php
@@ -75,9 +75,13 @@
 							<td>
 								<?php if ( $company_logo ) { ?>
 								<h3>
-									<a href="<?php echo wp_kses_post( $vendor_link['url'] ); ?>" <?php echo ! empty( $vendor_link['target'] ) ? wp_kses_post( "target='" . $vendor_link['target'] . "'" ) : ''; ?>>
+									<?php if ( $vendor_link ) { ?>
+										<a href="<?php echo wp_kses_post( $vendor_link['url'] ); ?>" <?php echo ! empty( $vendor_link['target'] ) ? wp_kses_post( "target='" . $vendor_link['target'] . "'" ) : ''; ?>>
+									<?php } ?>
 										<img src="<?php echo wp_kses_post( $company_logo['url'] ); ?>" alt="<?php echo wp_kses_post( $company_logo['alt'] ); ?>">
-									</a>
+									<?php if ( $vendor_link ) { ?>
+										</a>
+									<?php } ?>
 								</h3>
 								<?php } ?>
 							</td>
@@ -213,9 +217,13 @@
 				<tr>
 					<td>
 						<h3>
-							<a href="<?php echo wp_kses_post( $vendor_link['url'] ); ?>" <?php echo ! empty( $vendor_link['target'] ) ? wp_kses_post( "target='" . $vendor_link['target'] . "'" ) : ''; ?>>
+							<?php if ( $vendor_link ) { ?>
+								<a href="<?php echo wp_kses_post( $vendor_link['url'] ); ?>" <?php echo ! empty( $vendor_link['target'] ) ? wp_kses_post( "target='" . $vendor_link['target'] . "'" ) : ''; ?>>
+							<?php } ?>
 								<img src="<?php echo wp_kses_post( $company_logo['url'] ); ?>" alt="<?php echo wp_kses_post( $company_logo['alt'] ); ?>">
-							</a>
+							<?php if ( $vendor_link ) { ?>
+								</a>
+							<?php } ?>
 						</h3>
 					</td>
 				</tr>