diff --git a/src/GUI/DrawingArea.java b/src/GUI/DrawingArea.java
index a670fea18a7073dd8c5ce08804bea484a2bddb71..f6109535f0b4936d12141f59c7fbc36b73d05af7 100644
--- a/src/GUI/DrawingArea.java
+++ b/src/GUI/DrawingArea.java
@@ -268,10 +268,18 @@ public class DrawingArea extends JPanel implements MouseMotionListener, MouseLis
     public void mouseReleased(MouseEvent e) {
         IDrawingController drawingController = client.getDrawingController();
         switch (currentMode) {
+            case FREEHAND:
+                if (startPoint.equals(previousPoint)) {
+                    ((Line2D) drawing).setLine(startPoint, startPoint);
+                    g2.setColor(shapeColor);
+                    g2.setStroke(lineStroke);
+                    g2.draw(drawing);
+                }
+                break;
             case OVAL:
             case RECTANGLE:
             case CIRCLE:
-            case FREEHAND:
+
             case LINE:
                 g2.setColor(shapeColor);
                 // g2.fill(drawing);    /// Uncomment the line to fill the shapes with color ///