diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
index 0cd23d467e..0ff7217731 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
@@ -8,7 +8,7 @@ var thumbnailName = null;
 // Upload specific
 var uploadDirectory = null;
 var title = "";
-var overwrite = false;
+var overwrite = true; // If a filename clashes for a versionable file 
 
 // Update specific
 var updateNodeRef = null;
@@ -154,7 +154,7 @@ else
          if (existingFile !== null)
          {
             // File already exists, decide what to do
-            if (overwrite)
+            if (existingFile.hasAspect("cm:versionable") && overwrite)
             {
                // Upload component was configured to overwrite files if name clashes
                existingFile.properties.content.write(content);