diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index e3db2cfc5..3fe935ef3 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -534,6 +534,10 @@ HIDAPI_HasConnectedUSBDevice(const char *serial)
 {
     SDL_HIDAPI_Device *device;
 
+    if (!serial) {
+        return SDL_FALSE;
+    }
+
     for (device = SDL_HIDAPI_devices; device; device = device->next) {
         if (!device->driver) {
             continue;
@@ -555,6 +559,10 @@ HIDAPI_DisconnectBluetoothDevice(const char *serial)
 {
     SDL_HIDAPI_Device *device;
 
+    if (!serial) {
+        return;
+    }
+
     for (device = SDL_HIDAPI_devices; device; device = device->next) {
         if (!device->driver) {
             continue;