diff --git a/services/web/app/coffee/Features/Chat/ChatHandler.coffee b/services/web/app/coffee/Features/Chat/ChatHandler.coffee
index a8b5ef916d..e8aff01a26 100644
--- a/services/web/app/coffee/Features/Chat/ChatHandler.coffee
+++ b/services/web/app/coffee/Features/Chat/ChatHandler.coffee
@@ -19,8 +19,14 @@ module.exports =
 
 
 	getMessages: (project_id, query, callback)->
+		qs = {}
+		qs.limit = query.limit if query?.limit?
+		qs.before = query.before if query?.before?
+
 		opts =
 			uri:"#{settings.apis.chat.url}/room/#{project_id}/messages"
 			method:"get"
+			qs: qs
+
 		request opts, (err, response, body)->
 			callback(err, body)
\ No newline at end of file
diff --git a/services/web/test/UnitTests/coffee/Chat/ChatHandlerTests.coffee b/services/web/test/UnitTests/coffee/Chat/ChatHandlerTests.coffee
index 8b23595f16..b8b6b7b66f 100644
--- a/services/web/test/UnitTests/coffee/Chat/ChatHandlerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Chat/ChatHandlerTests.coffee
@@ -52,18 +52,33 @@ describe "ChatHandler", ->
 		beforeEach ->
 			@returnedMessages = [{content:"hello world"}]
 			@request.callsArgWith(1, null, null, @returnedMessages)
+			@query = {}
 
 		it "should make get request for room to chat api", (done)->
 
-			@ChatHandler.getMessages @project_id, (err)=>
+			@ChatHandler.getMessages @project_id, @query, (err)=>
 				@opts =
 					method:"get"
 					uri:"#{@settings.apis.chat.url}/room/#{@project_id}/messages"
+					qs:{}
+				@request.calledWith(@opts).should.equal true
+				done()
+
+		it "should make get request for room to chat api with query string", (done)->
+			@query = {limit:5, before:12345, ignore:"this"}
+
+			@ChatHandler.getMessages @project_id, @query, (err)=>
+				@opts =
+					method:"get"
+					uri:"#{@settings.apis.chat.url}/room/#{@project_id}/messages"
+					qs:
+						limit:5
+						before:12345
 				@request.calledWith(@opts).should.equal true
 				done()
 
 		it "should return the messages from the request", (done)->
-			@ChatHandler.getMessages @project_id, (err, returnedMessages)=>
+			@ChatHandler.getMessages @project_id, @query, (err, returnedMessages)=>
 				returnedMessages.should.equal @returnedMessages
 				done()