diff --git a/Makefile b/Makefile
index 12a0d43..59082f9 100644
--- a/Makefile
+++ b/Makefile
@@ -41,3 +41,4 @@ daemon:
 post_upgrade: upgrade_env run_migrations
 	# Make sure a tmp directory exists
 	mkdir acmsite/tmp
+	mkdir acmsite/uploads
diff --git a/acmsite/__init__.py b/acmsite/__init__.py
index 506050c..f86f9b2 100644
--- a/acmsite/__init__.py
+++ b/acmsite/__init__.py
@@ -44,11 +44,6 @@ def create_app():
 
     from .models import User
     
-    # Ensure that uploads directory exists
-    try:
-        os.mkdir(app.config["UPLOAD_FOLDER"]) 
-    except FileExistsError:
-        pass
 
     from .main import bp as main_bp
     app.register_blueprint(main_bp)