diff --git a/webapp/src/views/DeviceAdminView.vue b/webapp/src/views/DeviceAdminView.vue
index 1cc06487..e69559e3 100644
--- a/webapp/src/views/DeviceAdminView.vue
+++ b/webapp/src/views/DeviceAdminView.vue
@@ -91,14 +91,16 @@ export default defineComponent({
                 .then(
                     (data) => {
                         this.pinMappingList = data;
-                        this.pinMappingList.push({
-                            "name": this.$t('deviceadmin.DefaultProfile')
-                        } as Device);
-                        this.pinMappingList.sort((a, b) => (a.name < b.name) ? -1 : 1);
-                        this.pinMappingLoading = false;
                     }
                 )
                 .catch(() => {
+                    this.pinMappingList = Array<Device>();
+                })
+                .finally(() => {
+                    this.pinMappingList.push({
+                        "name": this.$t('deviceadmin.DefaultProfile')
+                    } as Device);
+                    this.pinMappingList.sort((a, b) => (a.name < b.name) ? -1 : 1);
                     this.pinMappingLoading = false;
                 });
         },