diff --git a/TactilityKernel/source/device.cpp b/TactilityKernel/source/device.cpp
index be4ec2cc1..9de3a11e4 100644
--- a/TactilityKernel/source/device.cpp
+++ b/TactilityKernel/source/device.cpp
@@ -381,11 +381,11 @@ bool device_is_constructed(const Device* device) {
 
 error_t device_get(Device* device) {
     auto* internal = device->internal;
-    lock_internal(internal);
-    if (!internal->state.started || internal->state.stopping) {
+    if (!internal) {
         unlock_internal(internal);
         return ERROR_INVALID_STATE;
     }
+    lock_internal(internal);
     internal->ref_count++;
     unlock_internal(internal);
     return ERROR_NONE;