diff --git a/reactos/drivers/ksfilter/ks/connectivity.c b/reactos/drivers/ksfilter/ks/connectivity.c
index 02c36e772e9..8ce3eb14489 100644
--- a/reactos/drivers/ksfilter/ks/connectivity.c
+++ b/reactos/drivers/ksfilter/ks/connectivity.c
@@ -378,8 +378,11 @@ KsPinPropertyHandler(
                 Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL;
                 break;
             }
+            if (Descriptor[Pin->PinId].Category)
+            {
+                RtlMoveMemory(Buffer, Descriptor[Pin->PinId].Category, sizeof(GUID));
+            }
 
-            RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Category, sizeof(GUID));
             Irp->IoStatus.Status = STATUS_SUCCESS;
             Irp->IoStatus.Information = Size;
             break;