diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 14e09d4773..2a46edb6b1 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -762,9 +762,17 @@ Push $2
     Delete  "$2\AppData\Roaming\Firestorm\typed_locations.txt"
 # Delete files in \Users\<User>\AppData\Local\Firestorm
     ${If} ${ISOPENSIM} == "0"
-        RMDir /r  "$2\AppData\Local\Firestorm"						#Delete the Havok cache folder
+        ${if} ${IS64BIT} == "0"
+            RMDir /r "$2\AppData\Local\Firestorm"				#Delete the Havok cache folder
+        ${Else}
+            RMDir /r "$2\AppData\Local\Firestorm_x64"			#Delete the OpenSim cache folder
+        ${EndIf}
     ${Else}
-        RMDir /r  "$2\AppData\Local\FirestormOS"					#Delete the OpenSim cache folder
+        ${if} ${IS64BIT} == "0"
+            RMDir /r "$2\AppData\Local\FirestormOS"			#Delete the Havok cache folder
+        ${Else}
+            RMDir /r "$2\AppData\Local\FirestormOS_x64"		#Delete the OpenSim cache folder
+        ${EndIf}
     ${EndIf}
 
   CONTINUE: