diff --git a/MacPass/MPContextToolbarButton.m b/MacPass/MPContextToolbarButton.m
index 00cc4467..7c1565d3 100644
--- a/MacPass/MPContextToolbarButton.m
+++ b/MacPass/MPContextToolbarButton.m
@@ -107,7 +107,10 @@
       break;
   }
   if([self.superclass instancesRespondToSelector:@selector(setControlSize:)]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
     super.controlSize = controlSize;
+#pragma clang diagnostic pop
   }
   else {
     self.cell.controlSize = controlSize;
@@ -116,7 +119,10 @@
 
 - (NSControlSize)controlSize {
   if([self.superclass instancesRespondToSelector:@selector(controlSize)]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
     return super.controlSize;
+#pragma clang diagnostic pop
   }
   return self.cell.controlSize;
 }
diff --git a/MacPass/MPToolbarButton.m b/MacPass/MPToolbarButton.m
index 91d59097..32b53a6b 100644
--- a/MacPass/MPToolbarButton.m
+++ b/MacPass/MPToolbarButton.m
@@ -56,7 +56,10 @@
       break;
   }
   if([self.superclass instancesRespondToSelector:@selector(setControlSize:)]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
     super.controlSize = controlSize;
+#pragma clang diagnostic pop
   }
   else {
     self.cell.controlSize = controlSize;
@@ -65,7 +68,10 @@
 
 - (NSControlSize)controlSize {
   if([self.superclass instancesRespondToSelector:@selector(controlSize)]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
     return super.controlSize;
+#pragma clang pop
   }
   return self.cell.controlSize;
 }