diff --git a/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp b/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp
index 62a860d197b..27c498d7a1a 100644
--- a/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp
+++ b/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp
@@ -21,11 +21,6 @@ static bool GetRingParamsFromCapset(enum VirtGpuCapset capset, const VirtGpuCaps
             bufferSize = caps.vulkanCapset.bufferSize;
             blobAlignment = caps.vulkanCapset.blobAlignment;
             break;
-        case kCapsetGfxStreamMagma:
-            ringSize = caps.magmaCapset.ringSize;
-            bufferSize = caps.magmaCapset.bufferSize;
-            blobAlignment = caps.magmaCapset.blobAlignment;
-            break;
         case kCapsetGfxStreamGles:
             ringSize = caps.glesCapset.ringSize;
             bufferSize = caps.glesCapset.bufferSize;
diff --git a/src/gfxstream/guest/platform/drm/DrmVirtGpuDevice.cpp b/src/gfxstream/guest/platform/drm/DrmVirtGpuDevice.cpp
index b22c336531f..eefbe5b5677 100644
--- a/src/gfxstream/guest/platform/drm/DrmVirtGpuDevice.cpp
+++ b/src/gfxstream/guest/platform/drm/DrmVirtGpuDevice.cpp
@@ -216,10 +216,6 @@ int32_t DrmVirtGpuDevice::init(int32_t descriptor) {
             get_caps.size = sizeof(struct vulkanCapset);
             get_caps.addr = (unsigned long long)&mCaps.vulkanCapset;
             break;
-        case kCapsetGfxStreamMagma:
-            get_caps.size = sizeof(struct magmaCapset);
-            get_caps.addr = (unsigned long long)&mCaps.magmaCapset;
-            break;
         case kCapsetGfxStreamGles:
             get_caps.size = sizeof(struct glesCapset);
             get_caps.addr = (unsigned long long)&mCaps.glesCapset;
diff --git a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp
index b59104846ca..38c5528cd85 100644
--- a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp
+++ b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp
@@ -32,7 +32,7 @@ FuchsiaVirtGpuDevice::FuchsiaVirtGpuDevice(enum VirtGpuCapset capset, magma_devi
     mCaps.params[kParamCreateGuestHandle] = 0;
 
     if (capset == kCapsetGfxStreamVulkan) {
-        uint64_t query_id = kMagmaVirtioGpuQueryCapset;
+        uint64_t query_id = 0;
         query_id |= static_cast<uint64_t>(kCapsetGfxStreamVulkan) << 32;
         constexpr uint16_t kVersion = 0;
         query_id |= static_cast<uint64_t>(kVersion) << 16;
diff --git a/src/gfxstream/guest/platform/include/VirtGpu.h b/src/gfxstream/guest/platform/include/VirtGpu.h
index 621943d92a1..cd680b1373c 100644
--- a/src/gfxstream/guest/platform/include/VirtGpu.h
+++ b/src/gfxstream/guest/platform/include/VirtGpu.h
@@ -45,7 +45,6 @@ enum VirtGpuCapset {
     kCapsetVenus = 4,
     kCapsetCrossDomain = 5,
     kCapsetDrm = 6,
-    kCapsetGfxStreamMagma = 7,
     kCapsetGfxStreamGles = 8,
     kCapsetGfxStreamComposer = 9,
 };
diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp
index 20168d2623a..70d58d02531 100644
--- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp
+++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp
@@ -81,10 +81,6 @@ VirtGpuKumquatDevice::VirtGpuKumquatDevice(enum VirtGpuCapset capset, int32_t de
             get_caps.size = sizeof(struct vulkanCapset);
             get_caps.addr = (unsigned long long)&mCaps.vulkanCapset;
             break;
-        case kCapsetGfxStreamMagma:
-            get_caps.size = sizeof(struct magmaCapset);
-            get_caps.addr = (unsigned long long)&mCaps.magmaCapset;
-            break;
         case kCapsetGfxStreamGles:
             get_caps.size = sizeof(struct glesCapset);
             get_caps.addr = (unsigned long long)&mCaps.glesCapset;