diff --git a/src/Controller/DomainsController.php b/src/Controller/DomainsController.php
index d0a483a..315962a 100644
--- a/src/Controller/DomainsController.php
+++ b/src/Controller/DomainsController.php
@@ -269,6 +269,9 @@ public function edit(Domains $domain, Request $request): Response
 
         $form = $this->createForm(DomainFormType::class, $domain);
 
+        $repository = $this->em->getRepository(Domains::class);
+        $bimivmcinfo = $repository->get_bimi_vmc_details(array($domain));
+
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             $formdata = $form->getData();
diff --git a/templates/domains/modal_bimivmcdetail.html.twig b/templates/domains/modal_bimivmcdetail.html.twig
index ee260ec..f788c21 100644
--- a/templates/domains/modal_bimivmcdetail.html.twig
+++ b/templates/domains/modal_bimivmcdetail.html.twig
@@ -6,6 +6,7 @@
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body">
+{% if bimivmcinfo[domain.id] is defined %}
 				<p>
 					These are the technical details for the installed BIMI VMC.<br>
 				</p>
@@ -115,6 +116,9 @@
 						</tr>
 					</tbody>
 				</table>
+{% else %}
+				No BIMI VMC installed for this domain.
+{% endif %}
 			</div>
 		</div>
 	</div>