diff --git a/app/uploaders/commissioner_image_uploader.rb b/app/uploaders/commissioner_image_uploader.rb
index 266abc77..8baa6dac 100644
--- a/app/uploaders/commissioner_image_uploader.rb
+++ b/app/uploaders/commissioner_image_uploader.rb
@@ -20,7 +20,11 @@ class CommissionerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir
diff --git a/app/uploaders/customer_image_uploader.rb b/app/uploaders/customer_image_uploader.rb
index f931ceaa..3c4c6f67 100644
--- a/app/uploaders/customer_image_uploader.rb
+++ b/app/uploaders/customer_image_uploader.rb
@@ -20,7 +20,11 @@ class CustomerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir
diff --git a/app/uploaders/employee_image_uploader.rb b/app/uploaders/employee_image_uploader.rb
index b247ab2c..f1e32849 100644
--- a/app/uploaders/employee_image_uploader.rb
+++ b/app/uploaders/employee_image_uploader.rb
@@ -20,7 +20,11 @@ class EmployeeImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir
diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb
index 4d1834fa..fdf63f8d 100755
--- a/app/uploaders/menu_item_image_uploader.rb
+++ b/app/uploaders/menu_item_image_uploader.rb
@@ -20,7 +20,11 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir
diff --git a/app/uploaders/product_image_uploader.rb b/app/uploaders/product_image_uploader.rb
index c8aeca8c..4b702a00 100755
--- a/app/uploaders/product_image_uploader.rb
+++ b/app/uploaders/product_image_uploader.rb
@@ -20,7 +20,11 @@ class ProductImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir
diff --git a/app/uploaders/shop_image_uploader.rb b/app/uploaders/shop_image_uploader.rb
index 66d6d9c8..009d83d9 100644
--- a/app/uploaders/shop_image_uploader.rb
+++ b/app/uploaders/shop_image_uploader.rb
@@ -20,7 +20,11 @@ class ShopImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    if Shop.find(1).shop_code.nil?
+      "#{original_filename}" if original_filename.present? 
+    else
+      "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? 
+    end    
   end
 
   # def cache_dir