diff --git a/sys/dev/thunderbolt/nhi.c b/sys/dev/thunderbolt/nhi.c
--- a/sys/dev/thunderbolt/nhi.c
+++ b/sys/dev/thunderbolt/nhi.c
@@ -322,6 +322,7 @@
 	tbdev_remove_interface(sc);
 
 	nhi_pci_disable_interrupts(sc);
+	nhi_pci_free_interrupts(sc);
 
 	nhi_free_ring0(sc);
 
diff --git a/sys/dev/thunderbolt/nhi_pci.c b/sys/dev/thunderbolt/nhi_pci.c
--- a/sys/dev/thunderbolt/nhi_pci.c
+++ b/sys/dev/thunderbolt/nhi_pci.c
@@ -67,7 +67,7 @@
 static int	nhi_pci_resume(device_t);
 static void	nhi_pci_free(struct nhi_softc *);
 static int	nhi_pci_allocate_interrupts(struct nhi_softc *);
-static void	nhi_pci_free_interrupts(struct nhi_softc *);
+static void	nhi_pci_free_resources(struct nhi_softc *);
 static int	nhi_pci_icl_poweron(struct nhi_softc *);
 
 static device_method_t nhi_methods[] = {
@@ -253,7 +253,7 @@
 nhi_pci_free(struct nhi_softc *sc)
 {
 
-	nhi_pci_free_interrupts(sc);
+	nhi_pci_free_resources(sc);
 
 	if (sc->parent_dmat != NULL) {
 		bus_dma_tag_destroy(sc->parent_dmat);
@@ -307,7 +307,7 @@
 	return (error);
 }
 
-static void
+void
 nhi_pci_free_interrupts(struct nhi_softc *sc)
 {
 	int i;
@@ -319,7 +319,11 @@
 	}
 
 	pci_release_msi(sc->dev);
+}
 
+static void
+nhi_pci_free_resources(struct nhi_softc *sc)
+{
 	if (sc->irq_table != NULL) {
 		bus_release_resource(sc->dev, SYS_RES_MEMORY,
 		    sc->irq_table_rid, sc->irq_table);
diff --git a/sys/dev/thunderbolt/nhi_var.h b/sys/dev/thunderbolt/nhi_var.h
--- a/sys/dev/thunderbolt/nhi_var.h
+++ b/sys/dev/thunderbolt/nhi_var.h
@@ -217,6 +217,7 @@
 int nhi_pci_configure_interrupts(struct nhi_softc *sc);
 void nhi_pci_enable_interrupt(struct nhi_ring_pair *r);
 void nhi_pci_disable_interrupts(struct nhi_softc *sc);
+void nhi_pci_free_interrupts(struct nhi_softc *sc);
 int nhi_pci_get_uuid(struct nhi_softc *sc);
 int nhi_read_lc_mailbox(struct nhi_softc *, u_int reg, uint32_t *val);
 int nhi_write_lc_mailbox(struct nhi_softc *, u_int reg, uint32_t val);