diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 92a98f1eca0..68b8954f57f 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -1645,7 +1645,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
         else
         {
             MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory );
-            remove_folder( folder );
+            if (folder) remove_folder( folder );
         }
     }
     return ERROR_SUCCESS;