diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 675a7d8614..a43a2f0c0f 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -915,7 +915,7 @@ void display(void)
         for(std::vector<Agent>::iterator agent = agentList->getAgents().begin();
             agent != agentList->getAgents().end();
             agent++) {
-            if (agent->getLinkedData() != NULL) {
+            if (agent->getLinkedData() != NULL && agent->getType() == AGENT_TYPE_AVATAR) {
                 Head *avatar = (Head *)agent->getLinkedData();
                 //glPushMatrix();