diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 1f3ebcd8c0..fd4358285f 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -685,6 +685,30 @@ FunctionEnd
 ;Installer Sections
 
 Section "-Core installation"
+  ;Delete any server-console files installed before it was placed in sub-folder
+  ;This is temporary and can be removed once users who had the initial installer have updated
+  Delete "$INSTDIR\server-console.exe"
+  Delete "$INSTDIR\locales"
+  Delete "$INSTDIR\resources\app"
+  Delete "$INSTDIR\resources\atom.asar"
+  Delete "$INSTDIR\build-info.json"
+  Delete "$INSTDIR\content_resources_200_percent.pak"
+  Delete "$INSTDIR\content_shell.pak"
+  Delete "$INSTDIR\d3dcompiler_47.dll"
+  Delete "$INSTDIR\icudtl.dat"
+  Delete "$INSTDIR\libEGL.dll"
+  Delete "$INSTDIR\libGLESv2.dll"
+  Delete "$INSTDIR\LICENSE"
+  Delete "$INSTDIR\LICENSES.chromium.html"
+  Delete "$INSTDIR\natives_blob.bin"
+  Delete "$INSTDIR\node.dll"
+  Delete "$INSTDIR\pdf.dll"
+  Delete "$INSTDIR\snapshot_blob.bin"
+  Delete "$INSTDIR\ui_resources_200_percent.pak"
+  Delete "$INSTDIR\vccorlib120.dll"
+  Delete "$INSTDIR\version"
+  Delete "$INSTDIR\xinput1_3.dll"
+
   ;Use the entire tree produced by the INSTALL target.  Keep the
   ;list of directories here in sync with the RMDir commands below.
   SetOutPath "$INSTDIR"