diff --git a/public/javascripts/spacedeck_whiteboard.js b/public/javascripts/spacedeck_whiteboard.js
index 8b8c1da..54be6aa 100644
--- a/public/javascripts/spacedeck_whiteboard.js
+++ b/public/javascripts/spacedeck_whiteboard.js
@@ -592,7 +592,8 @@ function setup_whiteboard_directives() {
         z: z,
         w: 64,
         h: 64,
-        stroke_color: "#000000",
+        // Set the color to the last selected color, fallback to black if no color was selected
+        stroke_color: "#" + $scope.color_picker_rgb || "#000000",
         stroke: 2,
         shape: "scribble"
       };
@@ -629,7 +630,8 @@ function setup_whiteboard_directives() {
         z: z,
         w: 64,
         h: 64,
-        stroke_color: "#000000",
+        // Set the color to the last selected color, fallback to black if no color was selected
+        stroke_color: "#" + $scope.color_picker_rgb || "#000000",
         stroke: 2,
         shape: "arrow"
       };