diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index c182b8aae06..719f876ffcd 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -4104,7 +4104,9 @@ void StorageUtl_CopyPropertyToSTATSTG(
   /*
    * The copy of the string occurs only when the flag is not set
    */
-  if ((statFlags & STATFLAG_NONAME) != 0)
+  if( ((statFlags & STATFLAG_NONAME) != 0) || 
+       (source->name == NULL) || 
+       (source->name[0] == 0) )
   {
     destination->pwcsName = 0;
   }