diff --git a/src/MSBuild.Conversion.Project/Converter.cs b/src/MSBuild.Conversion.Project/Converter.cs
index 5e4725875..a9f41ada4 100644
--- a/src/MSBuild.Conversion.Project/Converter.cs
+++ b/src/MSBuild.Conversion.Project/Converter.cs
@@ -89,6 +89,10 @@ private void CleanUpProjectFile(string outputPath)
             projectXml.Descendants().Elements().Where(x => x.Name == "PreBuildEvent" && string.IsNullOrEmpty(x.Value)).Remove();
             projectXml.Descendants().Elements().Where(x => x.Name == "PostBuildEvent" && string.IsNullOrEmpty(x.Value)).Remove();
 
+            // Remove empty ItemGroup and PropertyGroup elements
+            projectXml.Descendants().Elements().Where(x => x.Name == "ItemGroup" && x.IsEmpty && !x.HasElements && !x.HasAttributes).Remove();
+            projectXml.Descendants().Elements().Where(x => x.Name == "PropertyGroup" && x.IsEmpty && !x.HasElements && !x.HasAttributes).Remove();
+
             // Do not keep comments as the entire file is changing
             var readerSettings = new XmlReaderSettings()
             {