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 a9eb30d873..26e9b516ca 100644
--- a/src/app/project/ontology/property-info/property-info.component.html
+++ b/src/app/project/ontology/property-info/property-info.component.html
@@ -56,7 +56,11 @@
                 <mat-icon>tune</mat-icon>
             </button>
             <span matTooltipPosition="above"
-                [matTooltip]="((!propCanBeDeleted) ? 'The property can\'t be removed because it is in use' : 'Remove property from resource class')">
+                [matTooltip]="((!propCanBeDeleted) ?
+                    (propCard.isInherited ?
+                        'The property can\'t be removed because it is inherited from another class' :
+                        'The property can\'t be removed because it is in use'
+                    ) : 'Remove property from resource class')">
                 <button mat-button [disabled]="!propCanBeDeleted" class="delete"
                     (click)="removePropertyFromClass.emit({iri: propDef.id, label: propDef.label})">
                     <mat-icon>backspace</mat-icon>
@@ -73,7 +77,7 @@
                 </button>
             </span>
             <span matTooltipPosition="above"
-                [matTooltip]="((resClasses.length > 0 || !propCanBeDeleted) ? 'The property can\'t be deleted because it is used in a class' : 'Delete property')">
+                [matTooltip]="((resClasses.length > 0) ? 'The property can\'t be deleted because it is 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.ts b/src/app/project/ontology/property-info/property-info.component.ts
index df481f850c..f640bc83c8 100644
--- a/src/app/project/ontology/property-info/property-info.component.ts
+++ b/src/app/project/ontology/property-info/property-info.component.ts
@@ -283,14 +283,21 @@ export class PropertyInfoComponent implements OnChanges, AfterContentInit {
                 delCard.cardinalities = [this.propCard];
                 onto.entity = delCard;
 
-                this._dspApiConnection.v2.onto.canDeleteCardinalityFromResourceClass(onto).subscribe(
-                    (canDoRes: CanDoResponse) => {
-                        this.propCanBeDeleted = canDoRes.canDo;
-                    },
-                    (error: ApiResponseError) => {
-                        this._errorHandler.showMessage(error);
-                    }
-                );
+                // property can only be removed from class if it's not inherited from another prop or class
+                if (this.propCard.isInherited) {
+                    this.propCanBeDeleted = false;
+                } else {
+                    this._dspApiConnection.v2.onto.canDeleteCardinalityFromResourceClass(onto).subscribe(
+                        (canDoRes: CanDoResponse) => {
+                            this.propCanBeDeleted = canDoRes.canDo;
+                        },
+                        (error: ApiResponseError) => {
+                            this._errorHandler.showMessage(error);
+                        }
+                    );
+                }
+
+
             }
         }
     }