diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 35d9cd66..4bc1497e 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -291,6 +291,9 @@ on init
     chown system system /sys/devices/platform/google,cpm/dc_ctl
     # Important to include dd_state as it's used in battery defender in charger mode
     chown system system /sys/devices/platform/google,charger/dd_state
+    # Disable dock-defend by default
+    chown system system /sys/devices/platform/google,charger/dd_settings
+    write /sys/devices/platform/google,charger/dd_settings -1
 
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 82f6e184..d7227840 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -732,7 +732,9 @@ Status getPortStatusHelper(android::hardware::usb::Usb *usb,
             // When connected return powerBrickStatus
             if (port.second) {
                 string usbType;
-                if (ReadFileToString(string(kPowerSupplyUsbType), &usbType)) {
+                if ((*currentPortStatus)[i].currentPowerRole == PortPowerRole::SOURCE) {
+                    (*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::NOT_CONNECTED;
+                } else if (ReadFileToString(string(kPowerSupplyUsbType), &usbType)) {
                     if (strstr(usbType.c_str(), "[D")) {
                         (*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::CONNECTED;
                     } else if (strstr(usbType.c_str(), "[U")) {