diff --git a/backend/entrypoint.sh b/backend/entrypoint.sh
index 02ce3b1f46dc70ba77c831aa43798620b3eadaa0..e8eceafd487defc13160f585edaaa6d1c20b0efe 100755
--- a/backend/entrypoint.sh
+++ b/backend/entrypoint.sh
@@ -7,7 +7,11 @@ python manage.py showmigrations | tee /logs/show_migrate.log
 python manage.py migrate | tee /logs/command_migrate.log
 python manage.py showmigrations | tee /logs/show_migrate.log
 python manage.py clear_cache 
-python manage.py createadmin -u $ADMIN_USERNAME $ADMIN_EMAIL 2>&1 | tee /logs/command_createadmin.log
+
+if [ -n "$ADMIN_USERNAME" ]
+then
+    python manage.py createadmin -u $ADMIN_USERNAME $ADMIN_EMAIL 2>&1 | tee /logs/command_createadmin.log
+fi
 
 echo "Running backend server..."