diff --git a/firmware/baseband/sd_over_usb/hackrf_core.c b/firmware/baseband/sd_over_usb/hackrf_core.c
index b0ba5abef..9145a4a50 100644
--- a/firmware/baseband/sd_over_usb/hackrf_core.c
+++ b/firmware/baseband/sd_over_usb/hackrf_core.c
@@ -772,7 +772,7 @@ void cpu_clock_init(void) {
 clock_source_t activate_best_clock_source(void) {
 #ifdef HACKRF_ONE
     /* Ensure PortaPack reference oscillator is off while checking for external clock input. */
-    if (portapack_reference_oscillator && portapack()) {
+    if (portapack_present()) {
         portapack_reference_oscillator(false);
     }
 #endif
@@ -785,7 +785,7 @@ clock_source_t activate_best_clock_source(void) {
     } else {
 #ifdef HACKRF_ONE
         /* Enable PortaPack reference oscillator (if present), and check for valid clock. */
-        if (portapack_reference_oscillator && portapack()) {
+        if (portapack_present()) {
             portapack_reference_oscillator(true);
             delay(510000); /* loop iterations @ 204MHz for >10ms for oscillator to enable. */
             if (si5351c_clkin_signal_valid(&clock_gen)) {
diff --git a/hackrf b/hackrf
index ba2045a86..d371476c0 160000
--- a/hackrf
+++ b/hackrf
@@ -1 +1 @@
-Subproject commit ba2045a866387d9108c3c82b8ec9c13494d2f839
+Subproject commit d371476c03f77135c4fb5bf25cdb25d2ddaaab3c