diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc684dc4b6d..e51da43af62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -163,6 +163,7 @@
 - [Issue #89](https://github.com/influxdb/influxdb/issues/89). 'Group by' combined with 'where' not working
 - [Issue #106](https://github.com/influxdb/influxdb/issues/106). Don't panic if we only see one point and can't calculate derivative
 - [Issue #105](https://github.com/influxdb/influxdb/issues/105). Panic when using a where clause that reference columns with null values
+- [Issue #61](https://github.com/influxdb/influxdb/issues/61). Remove default limits from queries
 
 ### Deprecated
 
diff --git a/src/parser/parser.go b/src/parser/parser.go
index 9709435a52b..bd3f4d8ddda 100644
--- a/src/parser/parser.go
+++ b/src/parser/parser.go
@@ -22,10 +22,6 @@ type Operation int
 
 type ValueType int
 
-const (
-	DEFAULT_LIMIT = 10000
-)
-
 const (
 	ValueRegex        ValueType = C.VALUE_REGEX
 	ValueInt                    = C.VALUE_INT
@@ -456,7 +452,8 @@ func parseSelectDeleteCommonQuery(queryString string, fromClause *C.from_clause,
 func parseSelectQuery(queryString string, q *C.select_query) (*SelectQuery, error) {
 	limit := q.limit
 	if limit == -1 {
-		limit = DEFAULT_LIMIT
+		// no limit by default
+		limit = 0
 	}
 
 	basicQurey, err := parseSelectDeleteCommonQuery(queryString, q.from_clause, q.where_condition)
diff --git a/src/parser/query_api_test.go b/src/parser/query_api_test.go
index 8f2a18ae33d..92ac146b906 100644
--- a/src/parser/query_api_test.go
+++ b/src/parser/query_api_test.go
@@ -177,7 +177,7 @@ func (self *QueryApiSuite) TestDefaultLimit(c *C) {
 	for queryStr, limit := range map[string]int{
 		"select * from t limit 0":    0,
 		"select * from t limit 1000": 1000,
-		"select * from t;":           10000,
+		"select * from t;":           0,
 	} {
 		query, err := ParseSelectQuery(queryStr)
 		c.Assert(err, IsNil)