diff --git a/statement.go b/statement.go
index 7bdc1317..ed5c7558 100644
--- a/statement.go
+++ b/statement.go
@@ -288,11 +288,11 @@ func (stmt *Statement) BuildCondition(query interface{}, args ...interface{}) []
 			}
 
 			// The primary key type is not int, but string or uuid (#5984)
-			if len(args) == 0 {
-				return []clause.Expression{clause.IN{Column: clause.PrimaryColumn, Values: []interface{}{s}}}
-			}
+			//if len(args) == 0 {
+			//	return []clause.Expression{clause.IN{Column: clause.PrimaryColumn, Values: []interface{}{s}}}
+			//}
 
-			if len(args) > 0 && strings.Contains(s, "?") {
+			if len(args) == 0 || len(args) > 0 && strings.Contains(s, "?") {
 				// looks like a where condition
 				return []clause.Expression{clause.Expr{SQL: s, Vars: args}}
 			}