diff --git a/selfprivacy_api/services/moving.py b/selfprivacy_api/services/moving.py
index ecc505b..ce13b30 100644
--- a/selfprivacy_api/services/moving.py
+++ b/selfprivacy_api/services/moving.py
@@ -60,6 +60,9 @@ def move_folders_to_volume(
     job: Job,
 ) -> None:
     current_progress = job.progress
+    if current_progress is None:
+        current_progress = 0
+
     folder_percentage = 50 // len(folders)
     for folder in folders:
         folder_name = get_foldername(folder)
diff --git a/selfprivacy_api/services/service.py b/selfprivacy_api/services/service.py
index 224fde6..233e6e5 100644
--- a/selfprivacy_api/services/service.py
+++ b/selfprivacy_api/services/service.py
@@ -311,8 +311,8 @@ class Service(ABC):
         Only changes userdata
         """
 
+        service_id = cls.get_id()
         with WriteUserData() as user_data:
-            service_id = cls.get_id()
             if "modules" not in user_data:
                 user_data["modules"] = {}
             if service_id not in user_data["modules"]: