diff --git a/hooks/cinder_contexts.py b/hooks/cinder_contexts.py
index 805d00de..4f6bf218 100644
--- a/hooks/cinder_contexts.py
+++ b/hooks/cinder_contexts.py
@@ -144,9 +144,9 @@ class StorageBackendContext(OSContextGenerator):
                 backends.append('CEPH')
             if enable_lvm():
                 backends.append('LVM')
-        # Use the package default backend to stop the service flapping.
-        if not backends:
-            backends = ['LVM']
+            # Use the package default backend to stop the service flapping.
+            if not backends:
+                backends = ['LVM']
         return {
             'active_backends': backends,
             'backends': ",".join(backends)}
diff --git a/unit_tests/test_cinder_contexts.py b/unit_tests/test_cinder_contexts.py
index 35bd6879..3c1f52e3 100644
--- a/unit_tests/test_cinder_contexts.py
+++ b/unit_tests/test_cinder_contexts.py
@@ -118,7 +118,7 @@ class TestCinderContext(CharmTestCase):
         self.os_release.return_value = 'havana'
         self.assertEqual(
             contexts.StorageBackendContext()(),
-            {'active_backends': ['LVM'], 'backends': 'LVM'})
+            {'active_backends': [], 'backends': ''})
 
     def test_storage_backend_single_backend(self):
         rel_dict = {