diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementImpl.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementImpl.java
index 7c9c129210f51fc308940829b7365b92d295bb35..0acb92d60be6ff2f608db48767cc4fd007b3e891 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementImpl.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementImpl.java
@@ -84,6 +84,7 @@ public class FileElementImpl extends FormItemImpl implements FileElement, FormIt
 
 	private boolean checkForMaxFileSize = false;
 	private boolean checkForMimeTypes = false;
+	private boolean cropSelectionEnabled = false;
 	// error keys
 	private String i18nErrMandatory;
 	private String i18nErrMaxSize;
@@ -145,6 +146,7 @@ public class FileElementImpl extends FormItemImpl implements FileElement, FormIt
 					&& (uploadMimeType.startsWith("image/") || uploadMimeType.startsWith("video/"))) {
 				VFSLeaf media = new LocalFileImpl(tempUploadFile);
 				previewEl.setMedia(media, uploadMimeType);
+				previewEl.setCropSelectionEnabled(cropSelectionEnabled);
 				previewEl.setMaxWithAndHeightToFitWithin(300, 200);
 				previewEl.setVisible(true);
 			}
@@ -293,14 +295,11 @@ public class FileElementImpl extends FormItemImpl implements FileElement, FormIt
 			previewEl = null;
 		}
 	}
+	
 
 	@Override
 	public void setCropSelectionEnabled(boolean enable) {
-		if(enable) {
-			previewEl.setCropSelectionEnabled(true);
-		} else if(previewEl != null) {
-			previewEl.setCropSelectionEnabled(false);
-		}
+		this.cropSelectionEnabled = enable;
 	}
 
 	/**