diff --git a/reactos/drivers/filesystems/cdfs/cdfs.c b/reactos/drivers/filesystems/cdfs/cdfs.c
index 8db1860b05f..d7b44ccead0 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.c
+++ b/reactos/drivers/filesystems/cdfs/cdfs.c
@@ -99,6 +99,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
   DriverObject->DriverUnload = NULL;
 
   IoRegisterFileSystem(DeviceObject);
+  DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
 
   return(STATUS_SUCCESS);
 }
diff --git a/reactos/drivers/filesystems/cdfs/fsctl.c b/reactos/drivers/filesystems/cdfs/fsctl.c
index 7c71edcec32..74b22cdf878 100644
--- a/reactos/drivers/filesystems/cdfs/fsctl.c
+++ b/reactos/drivers/filesystems/cdfs/fsctl.c
@@ -358,8 +358,8 @@ CdfsMountVolume(PDEVICE_OBJECT DeviceObject,
   DeviceExt->StorageDevice->Vpb->DeviceObject = NewDeviceObject;
   DeviceExt->StorageDevice->Vpb->RealDevice = DeviceExt->StorageDevice;
   DeviceExt->StorageDevice->Vpb->Flags |= VPB_MOUNTED;
-  DeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1;
-  DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
+  NewDeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1;
+  NewDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
 
   DeviceExt->StreamFileObject = IoCreateStreamFileObject(NULL,
 							 DeviceExt->StorageDevice);