diff --git a/lib/swift_storage_utils.py b/lib/swift_storage_utils.py
index e1fd894..0f1ad2c 100644
--- a/lib/swift_storage_utils.py
+++ b/lib/swift_storage_utils.py
@@ -541,7 +541,7 @@ def setup_storage(encrypt=False):
             fstab_entry = fstab.get_entry_by_attr('mountpoint', mountpoint)
             if fstab_entry and loopback_device == fstab_entry.device:
                 dev = loopback_device
-            options = "loop,defaults"
+            options = "loop,nofail,defaults"
 
         filesystem = "xfs"
 
diff --git a/unit_tests/test_swift_storage_utils.py b/unit_tests/test_swift_storage_utils.py
index b0ca500..889fc44 100644
--- a/unit_tests/test_swift_storage_utils.py
+++ b/unit_tests/test_swift_storage_utils.py
@@ -513,7 +513,7 @@ class SwiftStorageUtilsTests(CharmTestCase):
             '/dev/loop0',
             '/srv/node/loop0',
             'xfs',
-            options='loop,defaults'
+            options='loop,nofail,defaults'
         )
 
         self.mkdir.assert_has_calls([
@@ -556,7 +556,7 @@ class SwiftStorageUtilsTests(CharmTestCase):
             '/srv/test.img',
             '/srv/node/loop0',
             'xfs',
-            options='loop,defaults'
+            options='loop,nofail,defaults'
         )
 
         self.mkdir.assert_has_calls([