diff --git a/releasenotes/notes/swift-upload-lock-d18f3d42b3a0719a.yaml b/releasenotes/notes/swift-upload-lock-d18f3d42b3a0719a.yaml
new file mode 100644
index 000000000..27848a5d2
--- /dev/null
+++ b/releasenotes/notes/swift-upload-lock-d18f3d42b3a0719a.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - Fixed an issue where a section of code that was supposed to be resetting
+    the SwiftService object was instead resetting the protective mutex around
+    the SwiftService object leading to an exception of "__exit__"
diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py
index eabc9f35f..ac4fc73d2 100644
--- a/shade/openstackcloud.py
+++ b/shade/openstackcloud.py
@@ -2209,7 +2209,7 @@ class OpenStackCloud(object):
         with self._swift_client_lock:
             self._swift_client = None
         with self._swift_service_lock:
-            self._swift_service_lock = None
+            self._swift_service = None
 
         self.create_object(
             container, name, filename,