diff --git a/lib/remote_storage/swift.rb b/lib/remote_storage/swift.rb
index b6aa7ec..63366e0 100644
--- a/lib/remote_storage/swift.rb
+++ b/lib/remote_storage/swift.rb
@@ -278,7 +278,11 @@ module RemoteStorage
     end
 
     def url_for_directory(user, directory)
-      "#{container_url_for(user)}/#{escape(directory)}"
+      if directory.empty?
+        container_url_for(user)
+      else
+        "#{container_url_for(user)}/#{escape(directory)}"
+      end
     end
 
     def base_url