diff --git a/source/blender/editors/object/object_shapekey.cc b/source/blender/editors/object/object_shapekey.cc
index be3f6b2229d..2945ec67d7e 100644
--- a/source/blender/editors/object/object_shapekey.cc
+++ b/source/blender/editors/object/object_shapekey.cc
@@ -478,9 +478,8 @@ static int shape_key_clear_exec(bContext *C, wmOperator * /*op*/)
 {
   Object *ob = context_object(C);
   Key *key = BKE_key_from_object(ob);
-  KeyBlock *kb = BKE_keyblock_from_object(ob);
 
-  if (!key || !kb) {
+  if (!key || BLI_listbase_is_empty(&key->block)) {
     return OPERATOR_CANCELLED;
   }
 
@@ -514,10 +513,9 @@ static int shape_key_retime_exec(bContext *C, wmOperator * /*op*/)
 {
   Object *ob = context_object(C);
   Key *key = BKE_key_from_object(ob);
-  KeyBlock *kb = BKE_keyblock_from_object(ob);
   float cfra = 0.0f;
 
-  if (!key || !kb) {
+  if (!key || BLI_listbase_is_empty(&key->block)) {
     return OPERATOR_CANCELLED;
   }