diff --git a/src/Server/CommandList.hpp b/src/Server/CommandList.hpp
index c348223..5cdeb13 100644
--- a/src/Server/CommandList.hpp
+++ b/src/Server/CommandList.hpp
@@ -57,4 +57,5 @@ enum ClientCommands : MessageCommandType {
 #define VERSION_STRING "0.2.0"
 
 // Arbitrary value. Higher scale up values lead to less scale up events (which can cause stuttering), but leads to larger numbers overall, which can cause a tiny bit of lag and increased memory usage
-#define CANVAS_SCALE_UP_STEP WorldScalar("100000000000000000000000000000000000000000000000000")
+//#define CANVAS_SCALE_UP_STEP WorldScalar("100000000000000000000000000000000000000000000000000")
+#define CANVAS_SCALE_UP_STEP WorldScalar(2)
diff --git a/src/Server/MainServer.cpp b/src/Server/MainServer.cpp
index 3534d7f..245c289 100644
--- a/src/Server/MainServer.cpp
+++ b/src/Server/MainServer.cpp
@@ -49,6 +49,7 @@ MainServer::MainServer(World& initWorld, const std::string& serverLocalID):
         hsv[1] = Random::get().real_range(0.3f, 0.7f);
         hsv[2] = 1.0;
         newClient.cursorColor = hsv_to_rgb<Vector3f>(hsv);
+        newClient.canvasScale = data.canvasScale;
         message(newClient.displayName, isDirectConnect);
         ensure_display_name_unique(newClient.displayName);