diff --git a/package-lock.json b/package-lock.json
index a3d81e9ebf..73f097c42d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@angular/platform-browser-dynamic": "^11.2.9",
         "@angular/router": "^11.2.9",
         "@ckeditor/ckeditor5-angular": "^1.2.3",
-        "@dasch-swiss/dsp-js": "^2.3.0",
+        "@dasch-swiss/dsp-js": "^2.4.0",
         "@dasch-swiss/dsp-ui": "^1.4.0",
         "@ngx-translate/core": "^12.1.2",
         "@ngx-translate/http-loader": "5.0.0",
@@ -2054,9 +2054,9 @@
       }
     },
     "node_modules/@dasch-swiss/dsp-js": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.3.0.tgz",
-      "integrity": "sha512-mjQh+sni9v3R0g/cQSZXbNgendrsx3ZmKXDih3DvBU2gSNabB9T32mgKDFb0MezbOo963+VpOSfPRwm0Kn/P/Q==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.4.0.tgz",
+      "integrity": "sha512-anHm+SP0qAqDpTcUHCSED37Wtalo1XWSLFFVcN2JYn7hMUFbXHGrdsw50UuK+RWMEDjEAbUwLomDxjxzry3opw==",
       "dependencies": {
         "@types/jsonld": "^1.5.0",
         "json2typescript": "1.4.1",
@@ -21837,9 +21837,9 @@
       }
     },
     "@dasch-swiss/dsp-js": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.3.0.tgz",
-      "integrity": "sha512-mjQh+sni9v3R0g/cQSZXbNgendrsx3ZmKXDih3DvBU2gSNabB9T32mgKDFb0MezbOo963+VpOSfPRwm0Kn/P/Q==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.4.0.tgz",
+      "integrity": "sha512-anHm+SP0qAqDpTcUHCSED37Wtalo1XWSLFFVcN2JYn7hMUFbXHGrdsw50UuK+RWMEDjEAbUwLomDxjxzry3opw==",
       "requires": {
         "@types/jsonld": "^1.5.0",
         "json2typescript": "1.4.1",
diff --git a/package.json b/package.json
index 293613608e..d3636fee2d 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "@angular/platform-browser-dynamic": "^11.2.9",
     "@angular/router": "^11.2.9",
     "@ckeditor/ckeditor5-angular": "^1.2.3",
-    "@dasch-swiss/dsp-js": "^2.3.0",
+    "@dasch-swiss/dsp-js": "^2.4.0",
     "@dasch-swiss/dsp-ui": "^1.4.0",
     "@ngx-translate/core": "^12.1.2",
     "@ngx-translate/http-loader": "5.0.0",
diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.html b/src/app/project/ontology/ontology-form/ontology-form.component.html
index b0cd1fe52a..57832f4527 100644
--- a/src/app/project/ontology/ontology-form/ontology-form.component.html
+++ b/src/app/project/ontology/ontology-form/ontology-form.component.html
@@ -1,6 +1,4 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
-
-<form [formGroup]="ontologyForm" (ngSubmit)="submitData()" class="form" *ngIf="!loading">
+<form [formGroup]="ontologyForm" (ngSubmit)="submitData()" class="form">
     <!-- auto complete list to select resource classes -->
     <div class="form-content">
         <mat-form-field class="large-field ontology-name">
diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.ts b/src/app/project/ontology/ontology-form/ontology-form.component.ts
index f4d77b6402..3b17464e1e 100644
--- a/src/app/project/ontology/ontology-form/ontology-form.component.ts
+++ b/src/app/project/ontology/ontology-form/ontology-form.component.ts
@@ -223,6 +223,7 @@ export class OntologyFormComponent implements OnInit {
             this._dspApiConnection.v2.onto.updateOntology(ontologyData).subscribe(
                 (response: OntologyMetadata) => {
                     this.updateParent.emit(response.id);
+                    this.loading = false;
                     this.closeDialog.emit(response.id);
                 },
                 (error: ApiResponseError) => {
@@ -246,6 +247,7 @@ export class OntologyFormComponent implements OnInit {
             this._dspApiConnection.v2.onto.createOntology(ontologyData).subscribe(
                 (response: OntologyMetadata) => {
                     this.updateParent.emit(response.id);
+                    this.loading = false;
                     this.closeDialog.emit(response.id);
                 },
                 (error: ApiResponseError) => {
diff --git a/src/app/project/ontology/ontology.component.html b/src/app/project/ontology/ontology.component.html
index b5fa76a14f..ad638a4d23 100644
--- a/src/app/project/ontology/ontology.component.html
+++ b/src/app/project/ontology/ontology.component.html
@@ -109,8 +109,8 @@ <h2 class="mat-title">
                         </button>
                     </span>
                     <span
-                        [matTooltip]="(ontology.lastModificationDate ? 'Delete data model' : 'This data model can\'t be edited because of missing lastModificationDate!')">
-                        <button mat-button [disabled]="!ontology.lastModificationDate"
+                        [matTooltip]="(ontology.lastModificationDate ? (ontologyCanBeDeleted ? 'Delete data model' : 'This data model can\'t be deleted because it is in use!') : 'This data model can\'t be deleted because of missing lastModificationDate!')">
+                        <button mat-button [disabled]="!ontology.lastModificationDate || !ontologyCanBeDeleted"
                             (click)="$event.stopPropagation(); delete('Ontology', {iri: ontologyIri, label: ontology.label})">
                             <mat-icon>delete</mat-icon>
                             Delete
diff --git a/src/app/project/ontology/ontology.component.spec.ts b/src/app/project/ontology/ontology.component.spec.ts
index 2fffa0971a..59e38ae7ab 100644
--- a/src/app/project/ontology/ontology.component.spec.ts
+++ b/src/app/project/ontology/ontology.component.spec.ts
@@ -1,5 +1,5 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatCardModule } from '@angular/material/card';
 import { MatOptionModule } from '@angular/material/core';
@@ -14,34 +14,53 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
+import { ApiResponseData, CanDoResponse, ListNodeInfo, ListsEndpointAdmin, ListsResponse, MockList, MockOntology, OntologiesEndpointV2, OntologiesMetadata, ReadOntology } from '@dasch-swiss/dsp-js';
 import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
+    DspActionModule, DspApiConnectionToken,
     DspCoreModule
 } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
+import { AjaxResponse } from 'rxjs/ajax';
+import { CacheService } from 'src/app/main/cache/cache.service';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
 import { OntologyVisualizerComponent } from './ontology-visualizer/ontology-visualizer.component';
 import { OntologyComponent } from './ontology.component';
 import { PropertyInfoComponent } from './property-info/property-info.component';
+import { ResourceClassInfoComponent } from './resource-class-info/resource-class-info.component';
 
 describe('OntologyComponent', () => {
     let component: OntologyComponent;
     let fixture: ComponentFixture<OntologyComponent>;
 
     beforeEach(waitForAsync(() => {
+        const ontologyEndpointSpyObj = {
+            admin: {
+                listsEndpoint: jasmine.createSpyObj('listsEndpoint', ['getListsInProject'])
+            },
+            v2: {
+                onto: jasmine.createSpyObj('onto', [
+                    'getOntologiesByProjectIri',
+                    'getOntology',
+                    'canDeleteOntology',
+                    'deleteOntology',
+                    'deleteResourceClass',
+                    'deleteResourceProperty'
+                ])
+            }
+        };
+
+        const cacheServiceSpy = jasmine.createSpyObj('CacheService', ['get', 'set']);
+
         TestBed.configureTestingModule({
             declarations: [
                 OntologyComponent,
                 OntologyVisualizerComponent,
                 DialogComponent,
                 ErrorComponent,
-                PropertyInfoComponent
+                PropertyInfoComponent,
+                ResourceClassInfoComponent
             ],
             imports: [
                 BrowserAnimationsModule,
@@ -76,14 +95,13 @@ describe('OntologyComponent', () => {
                         }
                     }
                 },
-                AppInitService,
                 {
-                    provide: DspApiConfigToken,
-                    useValue: TestConfig.ApiConfig
+                    provide: DspApiConnectionToken,
+                    useValue: ontologyEndpointSpyObj
                 },
                 {
-                    provide: DspApiConnectionToken,
-                    useValue: new KnoraApiConnection(TestConfig.ApiConfig)
+                    provide: CacheService,
+                    useValue: cacheServiceSpy
                 }
             ]
         })
@@ -111,8 +129,72 @@ describe('OntologyComponent', () => {
     });
 
     beforeEach(() => {
+        // set local storage session data
         localStorage.setItem('session', JSON.stringify(TestConfig.CurrentSession));
 
+        // set cache with current ontology
+        const cacheSpy = TestBed.inject(CacheService);
+
+        (cacheSpy as jasmine.SpyObj<CacheService>).get.and.callFake(
+            () => {
+                const response: ReadOntology = MockOntology.mockReadOntology('http://0.0.0.0:3333/ontology/0001/anything/v2');
+                return of(response);
+            }
+        );
+
+        // can delete ontology request
+        const dspConnSpy = TestBed.inject(DspApiConnectionToken);
+        (dspConnSpy.v2.onto as jasmine.SpyObj<OntologiesEndpointV2>).canDeleteOntology.and.callFake(
+            () => {
+                const deleteResClass: CanDoResponse = {
+                    'canDo': false
+                };
+
+                return of(deleteResClass);
+            }
+        );
+
+        (dspConnSpy.v2.onto as jasmine.SpyObj<OntologiesEndpointV2>).getOntologiesByProjectIri.and.callFake(
+            () => {
+                const response: OntologiesMetadata = MockOntology.mockOntologiesMetadata();
+                return of(response);
+            }
+        );
+
+        (dspConnSpy.v2.onto as jasmine.SpyObj<OntologiesEndpointV2>).getOntology.and.callFake(
+            () => {
+                const response: ReadOntology = MockOntology.mockReadOntology('http://0.0.0.0:3333/ontology/0001/anything/v2');
+                return of(response);
+            }
+        );
+
+        (dspConnSpy.admin.listsEndpoint as jasmine.SpyObj<ListsEndpointAdmin>).getListsInProject.and.callFake(
+            () => {
+                const response = new ListsResponse();
+
+                response.lists = new Array<ListNodeInfo>();
+
+                const mockList1 = new ListNodeInfo();
+                mockList1.comments = [];
+                mockList1.id = 'http://rdfh.ch/lists/0001/mockList01';
+                mockList1.isRootNode = true;
+                mockList1.labels = [{ language: 'en', value: 'Mock List 01' }];
+                mockList1.projectIri = 'http://rdfh.ch/projects/myProjectIri';
+
+                const mockList2 = new ListNodeInfo();
+                mockList2.comments = [];
+                mockList2.id = 'http://rdfh.ch/lists/0001/mockList02';
+                mockList2.isRootNode = true;
+                mockList2.labels = [{ language: 'en', value: 'Mock List 02' }];
+                mockList2.projectIri = 'http://rdfh.ch/projects/myProjectIri';
+
+                response.lists.push(mockList1, mockList2);
+
+                return of(ApiResponseData.fromAjaxResponse({ response } as AjaxResponse));
+            }
+        );
+
+
         fixture = TestBed.createComponent(OntologyComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
diff --git a/src/app/project/ontology/ontology.component.ts b/src/app/project/ontology/ontology.component.ts
index 4fb17b6556..248f30ed19 100644
--- a/src/app/project/ontology/ontology.component.ts
+++ b/src/app/project/ontology/ontology.component.ts
@@ -6,6 +6,7 @@ import { ActivatedRoute, Params, Router } from '@angular/router';
 import {
     ApiResponseData,
     ApiResponseError,
+    CanDoResponse,
     ClassDefinition,
     Constants,
     DeleteOntologyResponse,
@@ -81,6 +82,8 @@ export class OntologyComponent implements OnInit {
     // when updating something inside the ontology
     lastModificationDate: string;
 
+    ontologyCanBeDeleted: boolean;
+
     // all resource classes in the current ontology
     ontoClasses: ClassDefinition[];
     // expand the resource class cards
@@ -344,6 +347,16 @@ export class OntologyComponent implements OnInit {
         // grab the onto properties information to display
         this.initOntoProperties(ontology.getAllPropertyDefinitions());
 
+        // check if the ontology can be deleted
+        this._dspApiConnection.v2.onto.canDeleteOntology(this.ontology.id).subscribe(
+            (response: CanDoResponse) => {
+                this.ontologyCanBeDeleted = response.canDo;
+            },
+            (error: ApiResponseError) => {
+                this._errorHandler.showMessage(error);
+            }
+        );
+
         this.loadOntology = false;
     }
 
diff --git a/src/app/project/ontology/property-info/property-info.component.html b/src/app/project/ontology/property-info/property-info.component.html
index 7ac45eadec..897c877697 100644
--- a/src/app/project/ontology/property-info/property-info.component.html
+++ b/src/app/project/ontology/property-info/property-info.component.html
@@ -52,7 +52,7 @@
                 <mat-icon>tune</mat-icon>
             </button>
             <span
-                [matTooltip]="(resClasses.length > 0 ? 'The property can\'t be removed because it\'s in use' : 'Remove property from resource class')">
+                [matTooltip]="((resClasses.length > 0) ? 'The property can\'t be removed because it\'s in use' : 'Remove property from resource class')">
                 <!-- TODO: add "disabled" param as soon as we use DSP-API 13.9.1 and DSP-JS 2.4.0; use same value in matTooltip above  -->
                 <button mat-button class="delete"
                     (click)="removePropertyFromClass.emit({iri: propDef.id, label: propDef.label})">
@@ -67,7 +67,7 @@
                 <mat-icon>edit</mat-icon>
             </button>
             <span
-                [matTooltip]="(resClasses.length > 0 ? 'The property can\'t be deleted because it\'s used in a class' : 'Delete property')">
+                [matTooltip]="((resClasses.length > 0 || !propCanBeDeleted)? 'The property can\'t be deleted because it\'s used in a class' : 'Delete property')">
                 <button mat-button [disabled]="resClasses.length > 0" class="delete"
                     (click)="deleteResourceProperty.emit({iri: propDef.id, label: propDef.label})">
                     <mat-icon>delete</mat-icon>
diff --git a/src/app/project/ontology/property-info/property-info.component.spec.ts b/src/app/project/ontology/property-info/property-info.component.spec.ts
index 8b7f7bb937..177a0d8d1a 100644
--- a/src/app/project/ontology/property-info/property-info.component.spec.ts
+++ b/src/app/project/ontology/property-info/property-info.component.spec.ts
@@ -2,7 +2,7 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { Component, DebugElement, ViewChild } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatDialogHarness } from '@angular/material/dialog/testing';
@@ -12,8 +12,17 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { Constants, IHasProperty, ListNodeInfo, MockOntology, ReadOntology, ResourcePropertyDefinitionWithAllLanguages } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
+import {
+    CanDoResponse,
+    Constants,
+    IHasProperty,
+    ListNodeInfo,
+    MockOntology,
+    OntologiesEndpointV2,
+    ReadOntology,
+    ResourcePropertyDefinitionWithAllLanguages
+} from '@dasch-swiss/dsp-js';
+import { DspActionModule, DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
 import { DialogHeaderComponent } from 'src/app/main/dialog/dialog-header/dialog-header.component';
@@ -170,6 +179,12 @@ describe('PropertyInfoComponent', () => {
 
         const cacheServiceSpy = jasmine.createSpyObj('CacheService', ['get']);
 
+        const ontologyEndpointSpyObj = {
+            v2: {
+                onto: jasmine.createSpyObj('onto', ['canDeleteResourceProperty'])
+            }
+        };
+
         TestBed.configureTestingModule({
             declarations: [
                 DialogComponent,
@@ -191,6 +206,10 @@ describe('PropertyInfoComponent', () => {
                 MatTooltipModule
             ],
             providers: [
+                {
+                    provide: DspApiConnectionToken,
+                    useValue: ontologyEndpointSpyObj
+                },
                 {
                     provide: CacheService,
                     useValue: cacheServiceSpy
@@ -208,6 +227,19 @@ describe('PropertyInfoComponent', () => {
             .compileComponents();
     }));
 
+    beforeEach(() => {
+        const dspConnSpy = TestBed.inject(DspApiConnectionToken);
+        (dspConnSpy.v2.onto as jasmine.SpyObj<OntologiesEndpointV2>).canDeleteResourceProperty.and.callFake(
+            () => {
+                const deleteResProp: CanDoResponse = {
+                    'canDo': false
+                };
+
+                return of(deleteResProp);
+            }
+        );
+    });
+
     beforeEach(() => {
         simpleTextHostFixture = TestBed.createComponent(SimpleTextHostComponent);
         simpleTextHostComponent = simpleTextHostFixture.componentInstance;
diff --git a/src/app/project/ontology/property-info/property-info.component.ts b/src/app/project/ontology/property-info/property-info.component.ts
index 0f2e3ccbe1..11107daed5 100644
--- a/src/app/project/ontology/property-info/property-info.component.ts
+++ b/src/app/project/ontology/property-info/property-info.component.ts
@@ -1,15 +1,20 @@
 import { animate, state, style, transition, trigger } from '@angular/animations';
-import { AfterContentInit, Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
+import { AfterContentInit, Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output } from '@angular/core';
 import {
+    ApiResponseError,
+    CanDoResponse,
     Constants,
     IHasProperty,
+    KnoraApiConnection,
     ListNodeInfo,
     ReadOntology,
     ReadProject,
     ResourceClassDefinitionWithAllLanguages,
     ResourcePropertyDefinitionWithAllLanguages
 } from '@dasch-swiss/dsp-js';
+import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import {
     DefaultProperties,
     DefaultProperty,
@@ -101,6 +106,8 @@ export class PropertyInfoComponent implements OnChanges, AfterContentInit {
     propAttribute: string;
     propAttributeComment: string;
 
+    propCanBeDeleted: boolean;
+
     ontology: ReadOntology;
 
     project: ReadProject;
@@ -114,7 +121,9 @@ export class PropertyInfoComponent implements OnChanges, AfterContentInit {
     showActionBubble = false;
 
     constructor(
-        private _cache: CacheService
+        @Inject(DspApiConnectionToken) private _dspApiConnection: KnoraApiConnection,
+        private _cache: CacheService,
+        private _errorHandler: ErrorHandlerService
     ) { }
 
     ngOnChanges(): void {
@@ -207,6 +216,7 @@ export class PropertyInfoComponent implements OnChanges, AfterContentInit {
 
         // get all classes where the property is used
         if (!this.propCard) {
+
             this._cache.get('currentOntology').subscribe(
                 (response: ReadOntology) => {
                     this.ontology = response;
@@ -223,6 +233,16 @@ export class PropertyInfoComponent implements OnChanges, AfterContentInit {
                     }
                 }
             );
+
+            // check if the property can be deleted
+            this._dspApiConnection.v2.onto.canDeleteResourceProperty(this.propDef.id).subscribe(
+                (response: CanDoResponse) => {
+                    this.propCanBeDeleted = response.canDo;
+                },
+                (error: ApiResponseError) => {
+                    this._errorHandler.showMessage(error);
+                }
+            );
         }
 
     }
diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.html b/src/app/project/ontology/resource-class-info/resource-class-info.component.html
index 6d9702f76f..44c7ae878d 100644
--- a/src/app/project/ontology/resource-class-info/resource-class-info.component.html
+++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.html
@@ -14,7 +14,7 @@
         <span class="resource-class-header-action">
             <span class="resource-class-more"
                 [matTooltip]="(ontology.lastModificationDate ? 'more' : 'This data model can\'t be edited because of missing lastModificationDate!')">
-                <button mat-icon-button [matMenuTriggerFor]="resClassMenu" [disabled]="!ontology.lastModificationDate">
+                <button mat-icon-button [matMenuTriggerFor]="resClassMenu" class="res-class-menu" [disabled]="!ontology.lastModificationDate">
                     <mat-icon>more_horiz</mat-icon>
                 </button>
             </span>
@@ -25,16 +25,17 @@
             </span>
         </span>
         <mat-menu #resClassMenu="matMenu" xPosition="before">
-            <button mat-menu-item (click)="editResourceClass.emit({iri: resourceClass.id, label: resourceClass.label})">
+            <button mat-menu-item class="res-class-edit"
+                (click)="editResourceClass.emit({iri: resourceClass.id, label: resourceClass.label})">
                 Edit resource class info
             </button>
-            <!-- <button mat-menu-item (click)="updateCardinality.emit(resourceClass)">
-                Update corresponding properties
-            </button> -->
-            <button mat-menu-item
-                (click)="deleteResourceClass.emit({iri: resourceClass.id, label: resourceClass.label})">
-                Delete resource class
-            </button>
+            <span
+                [matTooltip]="(classCanBeDeleted ? null : 'This class can\'t be deleted because it is in use')">
+                <button mat-menu-item [disabled]="!classCanBeDeleted" class="res-class-delete"
+                    (click)="deleteResourceClass.emit({iri: resourceClass.id, label: resourceClass.label})">
+                    Delete resource class
+                </button>
+            </span>
         </mat-menu>
     </mat-card-header>
     <!-- resource class card content with list of properties -->
@@ -54,10 +55,8 @@
                     </span>
                     <!-- display only properties if they exist in list of properties;
                      objectType is not a linkValue (otherwise we have the property twice) -->
-                    <app-property-info class="property-info"
-                        [propDef]="ontology?.properties[prop.propertyIndex]"
-                        [propCard]="propsToDisplay[i]"
-                        [projectCode]="projectCode"
+                    <app-property-info class="property-info" [propDef]="ontology?.properties[prop.propertyIndex]"
+                        [propCard]="propsToDisplay[i]" [projectCode]="projectCode"
                         [(lastModificationDate)]="lastModificationDate"
                         (removePropertyFromClass)="removeProperty($event)">
                     </app-property-info>
@@ -80,15 +79,15 @@
 
         <mat-menu #addPropertyMenu="matMenu" xPosition="after">
             <button mat-menu-item [matMenuTriggerFor]="newFromPropType">Create new from type</button>
-            <button mat-menu-item [matMenuTriggerFor]="addExistingProp" [disabled]="!ontoProperties.length">Add existing property</button>
+            <button mat-menu-item [matMenuTriggerFor]="addExistingProp" [disabled]="!ontoProperties.length">Add existing
+                property</button>
         </mat-menu>
         <mat-menu #newFromPropType="matMenu">
             <ng-container *ngFor="let type of defaultProperties">
                 <button mat-menu-item [matMenuTriggerFor]="sub_menu">{{type.group}}</button>
                 <mat-menu #sub_menu="matMenu" class="default-nested-sub-menu">
                     <!-- <button *ngFor="let subItem of my_menu[mainItem]" mat-menu-item>{{ subItem }}</button> -->
-                    <button mat-menu-item *ngFor="let ele of type.elements" [value]="ele"
-                        (click)="addNewProperty(ele)">
+                    <button mat-menu-item *ngFor="let ele of type.elements" [value]="ele" (click)="addNewProperty(ele)">
                         <!-- (click)="openPropertyForm('createProperty', {propType: ele})"  -->
                         <mat-icon>{{ele.icon}}</mat-icon> {{ele.label}}
                     </button>
@@ -96,8 +95,7 @@
             </ng-container>
         </mat-menu>
         <mat-menu #addExistingProp="matMenu" class="default-nested-sub-menu">
-            <button mat-menu-item *ngFor="let prop of existingProperties"
-                (click)="addExistingProperty(prop.propDef)">
+            <button mat-menu-item *ngFor="let prop of existingProperties" (click)="addExistingProperty(prop.propDef)">
                 <mat-icon>{{prop.propType?.icon}}</mat-icon> {{prop.propDef.label}}
             </button>
         </mat-menu>
diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts b/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
index fbe60a7293..acea358c76 100644
--- a/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
+++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
@@ -5,10 +5,11 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { By } from '@angular/platform-browser';
-import { ClassDefinition, Constants, MockOntology, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspActionModule, DspApiConnectionToken, SortingService } from '@dasch-swiss/dsp-ui';
+import { CanDoResponse, ClassDefinition, Constants, MockOntology, OntologiesEndpointV2, ReadOntology } from '@dasch-swiss/dsp-js';
+import { AppInitService, DspActionModule, DspApiConfigToken, DspApiConnectionToken, SortingService } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { TestConfig } from 'test.config';
 import { ResourceClassInfoComponent } from './resource-class-info.component';
 
 /**
@@ -69,7 +70,7 @@ describe('ResourceClassInfoComponent', () => {
     beforeEach(waitForAsync(() => {
         const ontologyEndpointSpyObj = {
             v2: {
-                onto: jasmine.createSpyObj('onto', ['getOntology', 'replaceGuiOrderOfCardinalities'])
+                onto: jasmine.createSpyObj('onto', ['replaceGuiOrderOfCardinalities', 'canDeleteResourceClass'])
             }
         };
 
@@ -112,6 +113,18 @@ describe('ResourceClassInfoComponent', () => {
             }
         );
 
+        const dspConnSpy = TestBed.inject(DspApiConnectionToken);
+
+        (dspConnSpy.v2.onto as jasmine.SpyObj<OntologiesEndpointV2>).canDeleteResourceClass.and.callFake(
+            () => {
+                const deleteResClass: CanDoResponse = {
+                    'canDo': false
+                };
+
+                return of(deleteResClass);
+            }
+        );
+
         hostFixture = TestBed.createComponent(HostComponent);
         hostComponent = hostFixture.componentInstance;
         hostFixture.detectChanges();
@@ -134,4 +147,18 @@ describe('ResourceClassInfoComponent', () => {
 
         expect(subtitle.nativeElement.innerText).toEqual('Thing');
     });
+
+    it('expect delete res class button should be disabled', () => {
+        expect(hostComponent.resourceClassInfoComponent).toBeTruthy();
+        expect(hostComponent.resourceClassInfoComponent.resourceClass).toBeDefined();
+
+        const hostCompDe = hostFixture.debugElement;
+
+        const moreBtn: DebugElement = hostCompDe.query(By.css('.res-class-menu'));
+        moreBtn.nativeElement.click();
+
+        const deleteBtn: DebugElement = hostCompDe.query(By.css('.res-class-delete'));
+        expect(deleteBtn.nativeElement.disabled).toBeTruthy();
+
+    });
 });
diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.ts b/src/app/project/ontology/resource-class-info/resource-class-info.component.ts
index b26493b5e4..9e1660a5e7 100644
--- a/src/app/project/ontology/resource-class-info/resource-class-info.component.ts
+++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.ts
@@ -3,6 +3,7 @@ import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import {
     ApiResponseError,
+    CanDoResponse,
     ClassDefinition,
     IHasProperty,
     KnoraApiConnection,
@@ -57,6 +58,8 @@ export class ResourceClassInfoComponent implements OnInit {
 
     cardinalityUpdateEnabled: boolean;
 
+    classCanBeDeleted: boolean;
+
     // list of properties that can be displayed (not all of the props should be displayed)
     propsToDisplay: IHasProperty[] = [];
 
@@ -87,11 +90,21 @@ export class ResourceClassInfoComponent implements OnInit {
                 this.lastModificationDate = this.ontology.lastModificationDate;
                 this.translateSubClassOfIri(this.resourceClass.subClassOf);
                 this.preparePropsToDisplay(this.resourceClass.propertiesList);
+                // check if the class can be deleted
+                this._dspApiConnection.v2.onto.canDeleteResourceClass(this.resourceClass.id).subscribe(
+                    (res: CanDoResponse) => {
+                        this.classCanBeDeleted = res.canDo;
+                    },
+                    (error: ApiResponseError) => {
+                        this._errorHandler.showMessage(error);
+                    }
+                );
             },
             (error: ApiResponseError) => {
                 this._errorHandler.showMessage(error);
             }
         );
+
     }
 
     /**
@@ -204,6 +217,19 @@ export class ResourceClassInfoComponent implements OnInit {
 
     }
 
+    canBeDeleted() {
+
+        // check if the class can be deleted
+        this._dspApiConnection.v2.onto.canDeleteResourceClass(this.resourceClass.id).subscribe(
+            (response: CanDoResponse) => {
+                this.classCanBeDeleted = response.canDo;
+            },
+            (error: ApiResponseError) => {
+                this._errorHandler.showMessage(error);
+            }
+        );
+    }
+
     addNewProperty(propType: DefaultProperty) {
         const cardinality: CardinalityInfo = {
             resClass: this.resourceClass,