diff --git a/app/actions/annotations_update.rb b/app/actions/annotations_update.rb
index 11b41547955..d8c5a4e28b2 100644
--- a/app/actions/annotations_update.rb
+++ b/app/actions/annotations_update.rb
@@ -10,7 +10,7 @@ def update(resource, annotations, annotation_klass, destroy_nil: true)
           prefix, key_name = VCAP::CloudController::MetadataHelpers.extract_prefix(key)
 
           if value.nil? && destroy_nil # Delete Annotation
-            annotation_klass.where(resource_guid: resource.guid, key_name: key_name).where(Sequel.or([[:key_prefix, prefix], [:key_prefix, prefix.to_s]])).try(:destroy)
+            annotation_klass.where(resource_guid: resource.guid, key_name: key_name).where(Sequel.or([[:key_prefix, prefix], [:key_prefix, prefix.to_s]])).destroy
             next
           end
 
diff --git a/app/actions/labels_update.rb b/app/actions/labels_update.rb
index 5f7adab786a..d9d467fa6dc 100644
--- a/app/actions/labels_update.rb
+++ b/app/actions/labels_update.rb
@@ -12,7 +12,7 @@ def update(resource, labels, label_klass, destroy_nil: true)
           prefix, name = VCAP::CloudController::MetadataHelpers.extract_prefix(label_key)
 
           if label_value.nil? && destroy_nil # Delete Label
-            label_klass.find(key_prefix: prefix.to_s, resource_guid: resource.guid, key_name: name)&.destroy
+            label_klass.where(key_prefix: prefix.to_s, resource_guid: resource.guid, key_name: name).destroy
             next
           end