diff --git a/src/const.h b/src/const.h
index 6dbc04df45..9152c47f88 100644
--- a/src/const.h
+++ b/src/const.h
@@ -4,7 +4,7 @@
 #ifndef FS_CONST_H
 #define FS_CONST_H
 
-static constexpr int32_t NETWORKMESSAGE_MAXSIZE = 24590;
+static constexpr int32_t NETWORKMESSAGE_MAXSIZE = 40000;
 static constexpr int32_t MIN_MARKET_FEE = 20;
 static constexpr int32_t MAX_MARKET_FEE = 100000;
 
diff --git a/src/map.h b/src/map.h
index 781fb3c6eb..19df274de5 100644
--- a/src/map.h
+++ b/src/map.h
@@ -150,10 +150,10 @@ class QTreeLeafNode final : public QTreeNode
 class Map
 {
 public:
-	static constexpr int32_t maxViewportX = 11; // min value: maxClientViewportX + 1
-	static constexpr int32_t maxViewportY = 11; // min value: maxClientViewportY + 1
-	static constexpr int32_t maxClientViewportX = 8;
-	static constexpr int32_t maxClientViewportY = 6;
+	static constexpr int32_t maxViewportX = 33; //min value: maxClientViewportX + 1
+	static constexpr int32_t maxViewportY = 19; //min value: maxClientViewportY + 1
+	static constexpr int32_t maxClientViewportX = 32;
+	static constexpr int32_t maxClientViewportY = 18;
 
 	uint32_t clean() const;