diff --git a/src/data/cover.ts b/src/data/cover.ts
index 046da65aa3..a675539574 100644
--- a/src/data/cover.ts
+++ b/src/data/cover.ts
@@ -19,14 +19,14 @@ export const enum CoverEntityFeature {
 }
 
 export function isFullyOpen(stateObj: CoverEntity) {
-  if (stateObj.attributes.current_position !== undefined) {
+  if (stateObj.attributes.current_position != null) {
     return stateObj.attributes.current_position === 100;
   }
   return stateObj.state === "open";
 }
 
 export function isFullyClosed(stateObj: CoverEntity) {
-  if (stateObj.attributes.current_position !== undefined) {
+  if (stateObj.attributes.current_position != null) {
     return stateObj.attributes.current_position === 0;
   }
   return stateObj.state === "closed";
diff --git a/src/data/valve.ts b/src/data/valve.ts
index 645ca82e49..091322782a 100644
--- a/src/data/valve.ts
+++ b/src/data/valve.ts
@@ -14,20 +14,14 @@ export const enum ValveEntityFeature {
 }
 
 export function isFullyOpen(stateObj: ValveEntity) {
-  if (
-    stateObj.attributes.current_position !== undefined &&
-    stateObj.attributes.current_position !== null
-  ) {
+  if (stateObj.attributes.current_position != null) {
     return stateObj.attributes.current_position === 100;
   }
   return stateObj.state === "open";
 }
 
 export function isFullyClosed(stateObj: ValveEntity) {
-  if (
-    stateObj.attributes.current_position !== undefined &&
-    stateObj.attributes.current_position !== null
-  ) {
+  if (stateObj.attributes.current_position != null) {
     return stateObj.attributes.current_position === 0;
   }
   return stateObj.state === "closed";