diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 4667cb7c659..935b3e7311f 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -467,7 +467,7 @@ Template.room.events
 	'dropped #dropzone': (e) ->
 		FS.Utility.eachFile e, (file) ->
 			newFile = new (FS.File)(file)
-			newFile.room = "GENERAL"
+			newFile.room = Session.get('openedRoom')
 			Files.insert newFile, (error, fileObj) ->
 				if error
 					toastr.error 'Upload failed... please try again. Error: ' + error