diff --git a/coriolisclient/tests/v1/test_endpoint_storage.py b/coriolisclient/tests/v1/test_endpoint_storage.py
index 23d7acc..f845b31 100644
--- a/coriolisclient/tests/v1/test_endpoint_storage.py
+++ b/coriolisclient/tests/v1/test_endpoint_storage.py
@@ -46,7 +46,8 @@ def test_get_default(
     ):
         mock_endpoint = mock.Mock()
         mock_endpoint.uuid = '53773ab8-1474-4cf7-bf0c-a496a6595ecb'
-        mock_get.return_value = {"config_default": "mock_default"}
+        mock_get.return_value = endpoint_storage.EndpointStorage(
+            mock.Mock(), {"config_default": "mock_default"})
 
         result = self.endpoint.get_default(
             mock_endpoint,
diff --git a/coriolisclient/v1/endpoint_storage.py b/coriolisclient/v1/endpoint_storage.py
index 0c8ee8c..36d81d2 100644
--- a/coriolisclient/v1/endpoint_storage.py
+++ b/coriolisclient/v1/endpoint_storage.py
@@ -43,4 +43,4 @@ def get_default(self, endpoint, environment=None):
             encoded_env = common.encode_base64_param(environment, is_json=True)
             url = '%s?env=%s' % (url, encoded_env)
 
-        return self._get(url, 'storage').get('config_default')
+        return self._get(url, 'storage').to_dict().get('config_default')