diff --git a/internal/dinosql/parser.go b/internal/dinosql/parser.go
index 6201ff6cb4..247a524b53 100644
--- a/internal/dinosql/parser.go
+++ b/internal/dinosql/parser.go
@@ -990,8 +990,12 @@ func (p *paramSearch) Visit(node nodes.Node) Visitor {
 		p.parent = node
 
 	case nodes.SelectStmt:
-		p.limitCount = n.LimitCount
-		p.limitOffset = n.LimitOffset
+		if n.LimitCount != nil {
+			p.limitCount = n.LimitCount
+		}
+		if n.LimitOffset != nil {
+			p.limitOffset = n.LimitOffset
+		}
 
 	case nodes.TypeCast:
 		p.parent = node