diff --git a/client/modules/IDE/actions/project.js b/client/modules/IDE/actions/project.js
index 9055d484..2909742f 100644
--- a/client/modules/IDE/actions/project.js
+++ b/client/modules/IDE/actions/project.js
@@ -16,6 +16,8 @@ import {
 import { clearState, saveState } from '../../../persistState';
 
 const ROOT_URL = getConfig('API_URL');
+const S3_BUCKET_URL_BASE = getConfig('S3_BUCKET_URL_BASE');
+const S3_BUCKET = getConfig('S3_BUCKET');
 
 export function setProject(project) {
   return {
@@ -287,7 +289,7 @@ export function cloneProject(id) {
 
       // duplicate all files hosted on S3
       each(newFiles, (file, callback) => {
-        if (file.url && file.url.includes('amazonaws')) {
+        if (file.url && (file.url.includes(S3_BUCKET_URL_BASE) || file.url.includes(S3_BUCKET))) {
           const formParams = {
             url: file.url
           };
diff --git a/server/controllers/aws.controller.js b/server/controllers/aws.controller.js
index 6c0cb13b..32122c71 100644
--- a/server/controllers/aws.controller.js
+++ b/server/controllers/aws.controller.js
@@ -28,7 +28,7 @@ function getExtension(filename) {
 export function getObjectKey(url) {
   const urlArray = url.split('/');
   let objectKey;
-  if (urlArray.length === 6) {
+  if (urlArray.length === 5) {
     const key = urlArray.pop();
     const userId = urlArray.pop();
     objectKey = `${userId}/${key}`;