diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
index ceea682ef..83a1bdb26 100644
--- a/src/libostree/ostree-bootloader-grub2.c
+++ b/src/libostree/ostree-bootloader-grub2.c
@@ -77,6 +77,16 @@ _ostree_bootloader_grub2_query (OstreeBootloader *bootloader,
 {
   OstreeBootloaderGrub2 *self = OSTREE_BOOTLOADER_GRUB2 (bootloader);
 
+  /* FIXME: Endless specific patch: don't let libostree find our
+   * /boot/grub/grub.cfg because we manage that separately and disable
+   * grub-mkconfig. See:
+   * - https://phabricator.endlessm.com/T19614
+   * - https://phabricator.endlessm.com/T18848 */
+  {
+    *out_is_active = FALSE;
+    return TRUE;
+  }
+
   /* Look for the BIOS path first */
   if (g_file_query_exists (self->config_path_bios_1, NULL) ||
       g_file_query_exists (self->config_path_bios_2, NULL))