diff --git a/library/src/main/java/com/jaredrummler/android/device/DeviceDatabase.java b/library/src/main/java/com/jaredrummler/android/device/DeviceDatabase.java
index d51b1d6ae..8022c1d76 100644
--- a/library/src/main/java/com/jaredrummler/android/device/DeviceDatabase.java
+++ b/library/src/main/java/com/jaredrummler/android/device/DeviceDatabase.java
@@ -100,12 +100,12 @@ public DeviceInfo queryToDevice(@Nullable String codename, @Nullable String mode
     String[] selectionArgs;
 
     if (!TextUtils.isEmpty(codename) && !TextUtils.isEmpty(model)) {
-      selection = COLUMN_CODENAME + " LIKE ? OR " + COLUMN_MODEL + " LIKE ?";
+      selection = COLUMN_CODENAME + " LIKE ? AND " + COLUMN_MODEL + " LIKE ?";
       selectionArgs = new String[] { codename, model };
     } else if (!TextUtils.isEmpty(codename)) {
       selection = COLUMN_CODENAME + " LIKE ?";
       selectionArgs = new String[] { codename };
-    } else if (TextUtils.isEmpty(model)) {
+    } else if (!TextUtils.isEmpty(model)) {
       selection = COLUMN_MODEL + " LIKE ?";
       selectionArgs = new String[] { model };
     } else {