diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 59aded66b..072062ce4 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -23,6 +23,7 @@ class UploadsController < ApplicationController
 
   def create
   	@upload = Upload.create(params[:upload])
+  	@upload.delay.process!
     respond_with(@upload)
   end
   
diff --git a/app/models/upload.rb b/app/models/upload.rb
index c22128b14..3611e98e4 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -48,6 +48,8 @@ class Upload < ActiveRecord::Base
   
   module ConversionMethods
     def process!
+      return if status =~ /processing|completed|error/
+      
       CurrentUser.scoped(uploader, uploader_ip_addr) do
         update_attribute(:status, "processing")
         if is_downloadable?