diff --git a/Limelight/Database/TemporaryHost.h b/Limelight/Database/TemporaryHost.h
index 75d2d94..6062cda 100644
--- a/Limelight/Database/TemporaryHost.h
+++ b/Limelight/Database/TemporaryHost.h
@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, retain) NSString *mac;
 @property (nonatomic, retain) NSString *name;
 @property (nonatomic, retain) NSString *uuid;
+@property (nonatomic)         int serverCodecModeSupport;
 @property (nonatomic, retain) NSMutableSet *appList;
 
 - (id) initFromHost:(Host*)host;
diff --git a/Limelight/Database/TemporaryHost.m b/Limelight/Database/TemporaryHost.m
index 90b884f..c8d6ccb 100644
--- a/Limelight/Database/TemporaryHost.m
+++ b/Limelight/Database/TemporaryHost.m
@@ -30,6 +30,7 @@
     self.name = host.name;
     self.uuid = host.uuid;
     self.pairState = [host.pairState intValue];
+    self.serverCodecModeSupport = host.serverCodecModeSupport;
     
     NSMutableSet *appList = [[NSMutableSet alloc] init];
 
@@ -61,6 +62,7 @@
     }
     parentHost.name = self.name;
     parentHost.uuid = self.uuid;
+    parentHost.serverCodecModeSupport = self.serverCodecModeSupport;
     parentHost.pairState = [NSNumber numberWithInt:self.pairState];
 }
 
diff --git a/Limelight/Limelight.xcdatamodeld/Moonlight v1.1.xcdatamodel/contents b/Limelight/Limelight.xcdatamodeld/Moonlight v1.1.xcdatamodel/contents
index be75264..853831b 100644
--- a/Limelight/Limelight.xcdatamodeld/Moonlight v1.1.xcdatamodel/contents	
+++ b/Limelight/Limelight.xcdatamodeld/Moonlight v1.1.xcdatamodel/contents	
@@ -14,6 +14,7 @@
         <attribute name="mac" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="name" attributeType="String" syncable="YES"/>
         <attribute name="pairState" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="serverCodecModeSupport" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="appList" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="App" inverseName="host" inverseEntity="App" syncable="YES"/>
     </entity>
diff --git a/Limelight/Network/ServerInfoResponse.m b/Limelight/Network/ServerInfoResponse.m
index 0eb479c..65f44d4 100644
--- a/Limelight/Network/ServerInfoResponse.m
+++ b/Limelight/Network/ServerInfoResponse.m
@@ -39,6 +39,11 @@
     } else {
         host.pairState = PairStateUnknown;
     }
+    
+    NSString *serverCodecModeString = [self getStringTag:@"ServerCodecModeSupport"];
+    if (serverCodecModeString != nil) {
+        host.serverCodecModeSupport = [[serverCodecModeString trim] intValue];
+    }
 }
 
 @end