diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
index 00fa290f0fcccbae15513217fd775d649dd397e4..98f1f2b74f46b3057bfc68743aa0d4211146785e 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SampleLinksWidget.js
@@ -35,12 +35,26 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
 	this.samplesToEdit = (samplesToEdit)?samplesToEdit:new Array(); //Only used to populate the widget
 	this.samples = {};
 	this.samplesRemoved = {};
-	this.stateObj = null;
+	this.stateObj = {};
 	
 	this._lastUsedId = null;
 	this._lastIndex = 0;
 	
+	this._enableAnnotations = function() {
+		var enableAnnotations = false;
+		for(var i = 0; i < this.sampleTypeHints.length; i++) {
+			var sampleTypeHint = this.sampleTypeHints[i];
+			if(sampleTypeHint["ANNOTATION_PROPERTIES"].length > 0) {
+				enableAnnotations = true;
+			}
+		}
+		return enableAnnotations;
+	}
+	
 	this._writeState = function(permId, propertyTypeCode, propertyTypeValue) {
+		if(!this._enableAnnotations()) {
+			return;
+		}
 		this._readState();
 		
 		var sampleTypeAnnotations = this.stateObj[permId];
@@ -72,6 +86,9 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
 	}
 	
 	this._readState = function() {
+		if(!this._enableAnnotations()) {
+			return;
+		}
 		var stateField = $("#ANNOTATIONS_STATE");
 		if(stateField.length === 0) {
 			Util.showError("You need a property with code ANNOTATIONS_STATE on this entity to store the state of the annotations.");