diff --git a/lib/propolis/src/hw/nvme/admin.rs b/lib/propolis/src/hw/nvme/admin.rs
index df8746a62..ed0d454a7 100644
--- a/lib/propolis/src/hw/nvme/admin.rs
+++ b/lib/propolis/src/hw/nvme/admin.rs
@@ -463,6 +463,7 @@ impl NvmeCtrl {
         }
     }
 
+    #[allow(dead_code)]
     pub(super) fn acmd_doorbell_buf_cfg(
         &mut self,
         cmd: &cmds::DoorbellBufCfgCmd,
diff --git a/lib/propolis/src/hw/nvme/mod.rs b/lib/propolis/src/hw/nvme/mod.rs
index 78d0b1ffa..2a10c6f7d 100644
--- a/lib/propolis/src/hw/nvme/mod.rs
+++ b/lib/propolis/src/hw/nvme/mod.rs
@@ -844,8 +844,9 @@ impl PciNvme {
             nn: 1,
             // bit 0 indicates volatile write cache is present
             vwc: 1,
-            // bit 8 indicates Doorbell Buffer support
-            oacs: (1 << 8),
+            // bit 8 indicates Doorbell Buffer support. Theoretically supported,
+            // but disabled for Propolis issue #1008.
+            oacs: (0 << 8),
             ..Default::default()
         };
 
@@ -1339,8 +1340,16 @@ impl PciNvme {
                     // this can detect it and stop posting async events.
                     cmds::Completion::generic_err(bits::STS_INVAL_OPC).dnr()
                 }
-                AdminCmd::DoorbellBufCfg(cmd) => {
-                    state.acmd_doorbell_buf_cfg(&cmd)
+                AdminCmd::DoorbellBufCfg(_cmd) => {
+                    // XXX: issue #1008 suggests that Doorbell Buffer support
+                    // can end up with guest disks in a state that *looks like*
+                    // we've failed to notify after writing a completion. While
+                    // we're debugging this, we hide Doorbell Buffer support
+                    // from OACS. Instead, treat this the same as an
+                    // `AdminCmd::Unknown`.
+
+                    // state.acmd_doorbell_buf_cfg(&cmd)
+                    cmds::Completion::generic_err(bits::STS_INTERNAL_ERR)
                 }
                 AdminCmd::Unknown(_) => {
                     cmds::Completion::generic_err(bits::STS_INTERNAL_ERR)