diff --git a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java
index 29bfd01..0822ee8 100644
--- a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java
@@ -1,4 +1,5 @@
 package com.ntlab.irisserver.resources;
+import com.ntlab.irisserver.entities.RoomJson;
 import org.springframework.stereotype.Component;
 import com.ntlab.irisserver.entities.Room;
 import com.ntlab.irisserver.models.RoomManager;
@@ -17,20 +18,22 @@
     @POST //部屋の作成,オーナーを設定
     @Path("/")
     @Produces(MediaType.APPLICATION_JSON)
-    public Room makeRooms(@FormParam("nickname") String owner){
+    public RoomJson makeRooms(@FormParam("nickname") String owner){
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.createRoom(owner);
         room.addMember(owner);
+        RoomJson rj = new RoomJson(room);
 
-        return room;
+        return rj;
     }
 
     @GET//部屋の情報を表示
     @Path("/{rid}")
     @Produces(MediaType.APPLICATION_JSON)
-    public Room getRoomMember(@PathParam("rid") String rid){
+    public RoomJson getRoomMember(@PathParam("rid") String rid){
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
+        RoomJson rj = new RoomJson(room);
 
         if(room == null){
             //部屋がなければエラー
@@ -39,7 +42,7 @@
             throw new WebApplicationException(response.build());
         }
 
-        return room;
+        return rj;
     }
 
     @DELETE//部屋の削除