diff --git a/core/registrar.py b/core/registrar.py
index 1c1c9f3c768c6a110d35cfc6cbfca2c041a6a9cf..77be99874e3c10337971a532df55ea93371ce440 100644
--- a/core/registrar.py
+++ b/core/registrar.py
@@ -204,8 +204,8 @@ def registrar(
     metadata_package, data_package = None, None
     if not upload_container:
         # assuming objects_prefix = bucket/itemname
-        upload_container = objects_prefix.split("/")[0]
-        objects_prefix = objects_prefix.split("/")[1]
+        upload_container = objects_prefix.partition("/")[0]
+        objects_prefix = objects_prefix.partition("/")[2]
     with SwiftService() as swift:
         list_parts_gen = swift.list(
             container=upload_container, options={"prefix": objects_prefix},