diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 886e3fbb722dc1c37a1a2bad7a511ff7ea23b782..22c6d8f0906031272baa5582bfd608655bd17745 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3280,6 +3280,11 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
addPCIRoot = true;
break;
+ case VIR_ARCH_RISCV32:
+ case VIR_ARCH_RISCV64:
+ addDefaultUSB = false;
+ break;
+
case VIR_ARCH_S390:
case VIR_ARCH_S390X:
addDefaultUSB = false;
@@ -3306,8 +3311,6 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
case VIR_ARCH_OR32:
case VIR_ARCH_PARISC:
case VIR_ARCH_PARISC64:
- case VIR_ARCH_RISCV32:
- case VIR_ARCH_RISCV64:
case VIR_ARCH_PPCLE:
case VIR_ARCH_UNICORE32:
case VIR_ARCH_XTENSA:
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt.xml b/tests/qemuxml2xmloutdata/riscv64-virt.xml
index 822a59a604ecc744332bc9ee87497270d393417a..5e0d7caacffb6f8d34660eaf7a58ca90f4d05289 100644
--- a/tests/qemuxml2xmloutdata/riscv64-virt.xml
+++ b/tests/qemuxml2xmloutdata/riscv64-virt.xml
@@ -22,7 +22,6 @@