diff --git a/src/components/Screen/index.js b/src/components/Screen/index.js
index d8e8e8509..8ce28bc1b 100644
--- a/src/components/Screen/index.js
+++ b/src/components/Screen/index.js
@@ -28,8 +28,8 @@ class ScreenHeader extends Component {
 
 	headerTitle = () => {
 		const { agent, queueInfo, title } = this.props;
-		if (agent && agent.name) {
-			return agent.name;
+		if (agent && (agent.name || agent.nickname)) {
+			return agent.nickname || agent.name;
 		}
 
 		if (queueInfo && queueInfo.spot && queueInfo.spot > 0) {
diff --git a/src/routes/Chat/container.js b/src/routes/Chat/container.js
index 4e3efe80f..bf11d7344 100644
--- a/src/routes/Chat/container.js
+++ b/src/routes/Chat/container.js
@@ -390,6 +390,7 @@ export const ChatConnector = ({ ref, ...props }) => (
 				agent={agent ? {
 					_id: agent._id,
 					name: agent.name,
+					nickname: agent.nickname,
 					status: agent.status,
 					email: agent.emails && agent.emails[0] && agent.emails[0].address,
 					username: agent.username,