diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
index a92f27e7514..26a46bebdf1 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
@@ -124,6 +124,11 @@ func (s *store) Get(ctx context.Context, key string, resourceVersion string, out
 		if ignoreNotFound {
 			return runtime.SetZeroValue(out)
 		}
+		if len(resourceVersion) > 0 {
+			if rv, err := s.versioner.ParseResourceVersion(resourceVersion); err == nil {
+				return storage.NewKeyNotFoundError(key, int64(rv))
+			}
+		}
 		return storage.NewKeyNotFoundError(key, 0)
 	}
 	kv := getResp.Kvs[0]