diff --git a/src/vehicle-services/homelink.ts b/src/vehicle-services/homelink.ts
index 15ec39d..f3c09dc 100644
--- a/src/vehicle-services/homelink.ts
+++ b/src/vehicle-services/homelink.ts
@@ -6,10 +6,11 @@ export class HomelinkService extends BaseService {
     super(parent, parent.platform.Service.GarageDoorOpener, "Homelink", "homelink");
 
     const current = this.service
-      .getCharacteristic(this.parent.platform.Characteristic.CurrentDoorState);
+      .getCharacteristic(this.platform.Characteristic.CurrentDoorState)
+      .updateValue(this.platform.Characteristic.CurrentDoorState.CLOSED);
 
     const target = this.service
-      .getCharacteristic(this.parent.platform.Characteristic.TargetDoorState)
+      .getCharacteristic(this.platform.Characteristic.TargetDoorState)
       .onSet(async (value) => {
         if (value) {
           target.updateValue(value);
@@ -20,7 +21,8 @@ export class HomelinkService extends BaseService {
               target.updateValue(false);
             });
         }
-      });
+      })
+      .updateValue(this.platform.Characteristic.TargetDoorState.CLOSED);
 
   }
 }
diff --git a/src/vehicle-services/wake.ts b/src/vehicle-services/wake.ts
index eba0ef0..71de173 100644
--- a/src/vehicle-services/wake.ts
+++ b/src/vehicle-services/wake.ts
@@ -9,7 +9,7 @@ export class WakeService extends BaseService {
       .getCharacteristic(this.parent.platform.Characteristic.On)
       .onSet(async (value) => {
         if (value) {
-          await this.parent.wakeUpAndWait().then(() => on.updateValue(value));
+          await this.parent.wakeUpAndWait().then(() => on.updateValue(true));
         }
       });
 
diff --git a/src/vehicle.ts b/src/vehicle.ts
index 9ded7ba..719a02c 100644
--- a/src/vehicle.ts
+++ b/src/vehicle.ts
@@ -73,14 +73,13 @@ export class VehicleAccessory {
     new DefrostService(this);
     new DoorService(this, "front");
     new DoorService(this, "rear");
-    new HomelinkService(this);
     new LockService(this);
     new SentryService(this);
     new WindowService(this);
     new WakeService(this);
 
     if (this.platform.config.latitude && this.platform.config.longitude) {
-      //
+      new HomelinkService(this);
     }
 
     // Get data and schedule refresh