diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
index 12a536a303..ac75de152c 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
@@ -91,6 +91,7 @@ public class WhiteboardRoom {
 	}
 	
 	public List<Annotation> getAnnotations() {
+		if (activePresentation == null) return new ArrayList<Annotation>();
 		return activePresentation.getActivePage().getAnnotations();
 	}