diff --git a/package-lock.json b/package-lock.json
index 29a2d27fb..3ccdb9948 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
         "@fortawesome/fontawesome-free": "^5.2.0",
         "bootstrap-sass": "^3.3.7",
         "echarts": "^5.3.2",
+        "jsts": "^2.11.0",
         "magic-wand-tool": "^1.1.4",
         "polymorph-js": "^0.2.4",
         "uiv": "^1.2.4",
@@ -7059,6 +7060,14 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsts": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/jsts/-/jsts-2.11.0.tgz",
+      "integrity": "sha512-1++68krnA5CJ8DguYiqNWAtoDJl/4c6yLVKp+DylTKsOY73JERGRXYFT7ncPipHc33lgnjVWReKJO8+gpwm5ag==",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
     "node_modules/junk": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
@@ -16937,6 +16946,11 @@
         "universalify": "^2.0.0"
       }
     },
+    "jsts": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/jsts/-/jsts-2.11.0.tgz",
+      "integrity": "sha512-1++68krnA5CJ8DguYiqNWAtoDJl/4c6yLVKp+DylTKsOY73JERGRXYFT7ncPipHc33lgnjVWReKJO8+gpwm5ag=="
+    },
     "junk": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
diff --git a/package.json b/package.json
index 9e402b826..c9dfe61c3 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "@fortawesome/fontawesome-free": "^5.2.0",
     "bootstrap-sass": "^3.3.7",
     "echarts": "^5.3.2",
+    "jsts": "^2.11.0",
     "magic-wand-tool": "^1.1.4",
     "polymorph-js": "^0.2.4",
     "uiv": "^1.2.4",
diff --git a/resources/assets/js/annotations/annotatorContainer.vue b/resources/assets/js/annotations/annotatorContainer.vue
index b21736a8a..d35172c04 100644
--- a/resources/assets/js/annotations/annotatorContainer.vue
+++ b/resources/assets/js/annotations/annotatorContainer.vue
@@ -571,6 +571,9 @@ export default {
         dismissCrossOriginError() {
             this.crossOriginError = false;
         },
+        handleInvalidPolygon() {
+            Messages.danger(`Invalid shape. Polygon needs at least 3 non-overlapping vertices.`);
+        },
     },
     watch: {
         async imageId(id) {
diff --git a/resources/assets/js/annotations/components/annotationCanvas.vue b/resources/assets/js/annotations/components/annotationCanvas.vue
index 2d0373251..a15865a50 100644
--- a/resources/assets/js/annotations/components/annotationCanvas.vue
+++ b/resources/assets/js/annotations/components/annotationCanvas.vue
@@ -1,4 +1,5 @@
 <script>
+import * as PolygonValidator from '../ol/PolygonValidator';
 import AnnotationTooltip from './annotationCanvas/annotationTooltip';
 import AttachLabelInteraction from './annotationCanvas/attachLabelInteraction';
 import CanvasSource from '@biigle/ol/source/Canvas';
@@ -411,6 +412,7 @@ export default {
                     return this.featureRevisionMap[feature.getId()] !== feature.getRevision();
                 })
                 .map((feature) => {
+                    PolygonValidator.simplifyPolygon(feature);
                     return {
                         id: feature.getId(),
                         image_id: feature.get('annotation').image_id,
@@ -512,6 +514,22 @@ export default {
         handleNewFeature(e) {
             if (this.hasSelectedLabel) {
                 let geometry = e.feature.getGeometry();
+                if (geometry.getType() === 'Polygon') {
+                    if (PolygonValidator.isInvalidPolygon(e.feature)) {
+                        this.$emit('is-invalid-polygon');
+                        // This must be done in the change event handler.
+                        // Not exactly sure why.
+                        this.annotationSource.once('change', () => {
+                            if (this.annotationSource.hasFeature(e.feature)) {
+                                this.annotationSource.removeFeature(e.feature);
+                            }
+                        });
+                        return;
+                    }
+
+                    PolygonValidator.simplifyPolygon(e.feature);
+                }
+
                 e.feature.set('color', this.selectedLabel.color);
 
                 // This callback is called when saving the annotation succeeded or
diff --git a/resources/assets/js/annotations/ol/PolygonValidator.js b/resources/assets/js/annotations/ol/PolygonValidator.js
new file mode 100644
index 000000000..fd92128b8
--- /dev/null
+++ b/resources/assets/js/annotations/ol/PolygonValidator.js
@@ -0,0 +1,141 @@
+import 'jsts/org/locationtech/jts/monkey'; // This monkey patches jsts prototypes.
+import JstsLinearRing from 'jsts/org/locationtech/jts/geom/LinearRing';
+import LinearRing from '@biigle/ol/geom/LinearRing';
+import LineString from '@biigle/ol/geom/LineString';
+import MultiLineString from '@biigle/ol/geom/MultiLineString';
+import MultiPoint from '@biigle/ol/geom/MultiPoint';
+import MultiPolygon from '@biigle/ol/geom/MultiPolygon';
+import OL3Parser from 'jsts/org/locationtech/jts/io/OL3Parser';
+import Point from '@biigle/ol/geom/Point';
+import Polygon from '@biigle/ol/geom/Polygon';
+import Polygonizer from 'jsts/org/locationtech/jts/operation/polygonize/Polygonizer';
+
+/**
+ * Checks if polygon consists of at least 3 unique points
+ *
+ * @param feature containing the polygon
+ * @returns True if coordinates contains at least 3 unique points, otherwise false
+ */
+export function isInvalidPolygon(feature) {
+    let polygon = feature.getGeometry();
+    let points = polygon.getCoordinates()[0];
+
+    return (new Set(points.map(xy => String([xy])))).size < 3;
+}
+
+/**
+ * Makes non-simple polygon simple
+ *
+ * @param feature feature containing the (non-simple) polygon
+ */
+export function simplifyPolygon(feature) {
+    if (feature.getGeometry().getType() !== 'Polygon') {
+        throw new Error("Only polygon geometries are supported.");
+    }
+
+    // Check if polygon is self-intersecting
+    const parser = new OL3Parser();
+    parser.inject(
+        Point,
+        LineString,
+        LinearRing,
+        Polygon,
+        MultiPoint,
+        MultiLineString,
+        MultiPolygon
+    );
+
+    // Translate ol geometry into jsts geometry
+    let jstsPolygon = parser.read(feature.getGeometry());
+
+    if (jstsPolygon.isSimple()) {
+        return feature;
+    }
+
+    let simplePolygons = jstsSimplify(jstsPolygon);
+    let greatestPolygon = getGreatestPolygon(simplePolygons);
+    // Convert back to OL geometry.
+    greatestPolygon = parser.write(greatestPolygon);
+    feature.getGeometry().setCoordinates(greatestPolygon.getCoordinates());
+}
+
+/**
+ * @author Martin Kirk
+ *
+ * @link https://stackoverflow.com/questions/36118883/using-jsts-buffer-to-identify-a-self-intersecting-polygon
+ *
+ *
+ *  Get / create a valid version of the geometry given. If the geometry is a polygon or multi polygon, self intersections /
+ * inconsistencies are fixed. Otherwise the geometry is returned.
+ *
+ * @param geom
+ * @return a geometry
+ */
+function jstsSimplify(geom) {
+    if (geom.isValid()) {
+        geom.normalize(); // validate does not pick up rings in the wrong order - this will fix that
+        return geom; // If the polygon is valid just return it
+    }
+
+    let polygonizer = new Polygonizer();
+    jstsAddPolygon(geom, polygonizer);
+
+    let polygons = polygonizer.getPolygons().array
+        // Remove holes by using the exterior ring.
+        .map(p => p.getExteriorRing())
+        // Convert (exterior) LinearRing to Polygon.
+        .map(r => geom.getFactory().createPolygon(r));
+
+    return polygons;
+}
+
+/**
+* @author Martin Kirk
+* 
+* @link https://stackoverflow.com/questions/36118883/using-jsts-buffer-to-identify-a-self-intersecting-polygon
+* 
+* Add all line strings from the polygon given to the polygonizer given
+*
+* @param polygon polygon from which to extract line strings
+* @param polygonizer polygonizer
+*/
+function jstsAddPolygon(polygon, polygonizer) {
+    jstsAddLineString(polygon.getExteriorRing(), polygonizer);
+}
+
+/**
+* @author Martin Kirk
+* 
+* @link https://stackoverflow.com/questions/36118883/using-jsts-buffer-to-identify-a-self-intersecting-polygon 
+* Add the linestring given to the polygonizer
+*
+* @param linestring line string
+* @param polygonizer polygonizer
+*/
+function jstsAddLineString(lineString, polygonizer) {
+
+    if (lineString instanceof JstsLinearRing) {
+        // LinearRings are treated differently to line strings : we need a LineString NOT a LinearRing
+        lineString = lineString.getFactory().createLineString(lineString.getCoordinateSequence());
+    }
+
+    // unioning the linestring with the point makes any self intersections explicit.
+    var point = lineString.getFactory().createPoint(lineString.getCoordinateN(0));
+    var toAdd = lineString.union(point); //geometry
+
+    //Add result to polygonizer
+    polygonizer.add(toAdd);
+}
+
+/**
+ * Determine polygon with largest area
+ * 
+ * @param polygonList List of polygons
+ * @returns Polygon
+ * **/
+function getGreatestPolygon(polygonList) {
+    let areas = polygonList.map(p => p.getArea());
+    let idx = areas.indexOf(Math.max(...areas));
+
+    return polygonList[idx];
+}
diff --git a/resources/assets/js/videos/components/videoScreen/drawInteractions.vue b/resources/assets/js/videos/components/videoScreen/drawInteractions.vue
index 3ea9c7014..66c391f05 100644
--- a/resources/assets/js/videos/components/videoScreen/drawInteractions.vue
+++ b/resources/assets/js/videos/components/videoScreen/drawInteractions.vue
@@ -1,10 +1,10 @@
 <script>
+import * as PolygonValidator from "../../../annotations/ol/PolygonValidator";
 import DrawInteraction from '@biigle/ol/interaction/Draw';
 import Keyboard from '../../../core/keyboard';
 import Styles from '../../../annotations/stores/styles';
 import VectorLayer from '@biigle/ol/layer/Vector';
 import VectorSource from '@biigle/ol/source/Vector';
-
 /**
  * Mixin for the videoScreen component that contains logic for the draw interactions.
  *
@@ -163,6 +163,22 @@ export default {
             this.$emit('pending-annotation', null);
         },
         extendPendingAnnotation(e) {
+            // Check polygons
+            if (e.feature.getGeometry().getType() === 'Polygon') {
+                if (PolygonValidator.isInvalidPolygon(e.feature)) {
+                    // Disallow polygons with less than three non-overlapping points
+                    this.$emit('is-invalid-polygon')
+                    // Wait for this feature to be added to the source, then clear.
+                    this.pendingAnnotationSource.once('addfeature', () => {
+                        this.resetPendingAnnotation();
+                    });
+                    return;
+                }
+
+                // If polygon is self-intersecting, create simple polygon
+                PolygonValidator.simplifyPolygon(e.feature);
+            }
+
             let lastFrame = this.pendingAnnotation.frames[this.pendingAnnotation.frames.length - 1];
 
             if (lastFrame === undefined || lastFrame < this.video.currentTime) {
@@ -175,6 +191,9 @@ export default {
                     this.autoplayDrawTimeout = window.setTimeout(this.pause, this.autoplayDraw * 1000);
                 }
             } else {
+                // If the pending annotation (time) is invalid, remove it again.
+                // We have to wait for this feature to be added to the source to be able
+                // to remove it.
                 this.pendingAnnotationSource.once('addfeature', function (e) {
                     this.removeFeature(e.feature);
                 });
diff --git a/resources/assets/js/videos/components/videoScreen/modifyInteractions.vue b/resources/assets/js/videos/components/videoScreen/modifyInteractions.vue
index d8823ed08..92d3cf9fc 100644
--- a/resources/assets/js/videos/components/videoScreen/modifyInteractions.vue
+++ b/resources/assets/js/videos/components/videoScreen/modifyInteractions.vue
@@ -5,6 +5,7 @@ import ModifyInteraction from '@biigle/ol/interaction/Modify';
 import TranslateInteraction from '../../../annotations/ol/TranslateInteraction';
 import {shiftKeyOnly as shiftKeyOnlyCondition} from '@biigle/ol/events/condition';
 import {singleClick as singleClickCondition} from '@biigle/ol/events/condition';
+import * as PolygonValidator from "../../../annotations/ol/PolygonValidator";
 
 const allowedSplitShapes = ['Point', 'Circle', 'Rectangle', 'WholeFrame'];
 
@@ -79,6 +80,17 @@ export default {
                     return this.featureRevisionMap[feature.getId()] !== feature.getRevision();
                 })
                 .map((feature) => {
+                    // Check polygons
+                    if (feature.getGeometry().getType() === 'Polygon') {
+                        if (PolygonValidator.isInvalidPolygon(feature)) {
+                            // Disallow polygons with less than three non-overlapping points
+                            this.$emit('is-invalid-polygon')
+                            return;
+                        }
+                        
+                        // If polygon is self-intersecting, create simple polygon
+                        PolygonValidator.simplifyPolygon(feature);
+                    }
                     return {
                         annotation: feature.get('annotation'),
                         points: this.getPointsFromGeometry(feature.getGeometry()),
diff --git a/resources/assets/js/videos/videoContainer.vue b/resources/assets/js/videos/videoContainer.vue
index 709279564..b1c905813 100644
--- a/resources/assets/js/videos/videoContainer.vue
+++ b/resources/assets/js/videos/videoContainer.vue
@@ -277,6 +277,7 @@ export default {
                 shape_id: this.shapes[pendingAnnotation.shape],
                 label_id: this.selectedLabel ? this.selectedLabel.id : 0,
             });
+
             delete annotation.shape;
 
             return VideoAnnotationApi.save({id: this.videoId}, annotation)
@@ -624,6 +625,9 @@ export default {
                 annotation.failTracking();
             }
         },
+        handleInvalidPolygon() {
+            Messages.danger(`Invalid shape. Polygon needs at least 3 non-overlapping vertices.`);
+        },
     },
     watch: {
         'settings.playbackRate'(rate) {
diff --git a/resources/views/annotations/show.blade.php b/resources/views/annotations/show.blade.php
index 14d5210ba..a1ec38288 100644
--- a/resources/views/annotations/show.blade.php
+++ b/resources/views/annotations/show.blade.php
@@ -95,6 +95,7 @@
             v-on:delete="handleDeleteAnnotations"
             v-on:measuring="fetchImagesArea"
             v-on:requires-selected-label="handleRequiresSelectedLabel"
+            v-on:is-invalid-polygon="handleInvalidPolygon"
             ref="canvas"
             inline-template>
             @include('annotations.show.annotationCanvas')
diff --git a/resources/views/videos/show/content.blade.php b/resources/views/videos/show/content.blade.php
index 5303923ac..b6cf7a816 100644
--- a/resources/views/videos/show/content.blade.php
+++ b/resources/views/videos/show/content.blade.php
@@ -60,6 +60,7 @@
       v-on:attaching-active="handleAttachingLabelActive"
       v-on:swapping-active="handleSwappingLabelActive"
       v-on:seek="seek"
+      v-on:is-invalid-polygon="handleInvalidPolygon"
       ></video-screen>
 <video-timeline
       ref="videoTimeline"