diff --git a/reactos/drivers/storage/class/cdrom/cdrom.c b/reactos/drivers/storage/class/cdrom/cdrom.c
index e90825a04ab..7629de00106 100644
--- a/reactos/drivers/storage/class/cdrom/cdrom.c
+++ b/reactos/drivers/storage/class/cdrom/cdrom.c
@@ -2139,7 +2139,6 @@ ScsiCdRomStartIo(
                     IoCompleteRequest(Irp, IO_DISK_INCREMENT);
                     ExFreePool(senseBuffer);
                     ExFreePool(srb);
-                    IoFreeIrp(irp2);
                     IoStartNextPacket(DeviceObject, FALSE);
                     DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__));
                     return;
@@ -2764,6 +2763,9 @@ ScsiCdRomStartIo(
             //
 
             IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            ExFreePool(senseBuffer);
+            ExFreePool(srb);
+            IoFreeIrp(irp2);
             return;
 
         } // end switch()
@@ -2953,6 +2955,17 @@ CdRomDeviceControlCompletion(
                 (realIrpStack->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL)) &&
                 (realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_CHECK_VERIFY)) {
 
+                ExFreePool(srb->SenseInfoBuffer);
+                if (srb->DataBuffer) {
+                    ExFreePool(srb->DataBuffer);
+                }
+                ExFreePool(srb);
+                if (Irp->MdlAddress) {
+                    IoFreeMdl(Irp->MdlAddress);
+                }
+
+                IoFreeIrp(Irp);
+
                 //
                 // Update the geometry information, as the media could have changed.
                 // The completion routine for this will complete the real irp and start