diff --git a/esp32_marauder/Display.cpp b/esp32_marauder/Display.cpp
index b0a6351..6702a69 100644
--- a/esp32_marauder/Display.cpp
+++ b/esp32_marauder/Display.cpp
@@ -110,34 +110,36 @@ bool Display::isTouchHeld(uint16_t threshold) {
 }
 
 void Display::setCalData(bool landscape) {
-  if (!landscape) {
-    #ifdef TFT_SHIELD
-      uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
-    #elif defined(MARAUDER_CYD_3_5_INCH)
-      uint16_t calData[5] = { 239, 3560, 262, 3643, 4 };
-    #elif defined(MARAUDER_V8)
-      uint16_t calData[5] = { 298, 3451, 377, 3509, 4 };
-    #elif defined(TFT_DIY)
-      uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
-    #endif
-    #ifdef HAS_ILI9341
-      tft.setTouch(calData);
-    #endif
-  }
-  else {
-    #ifdef TFT_SHIELD
-      uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield
-    #elif defined(MARAUDER_CYD_3_5_INCH)
-      uint16_t calData[5] = { 272, 3648, 234, 3565, 7 };
-    #elif defined(MARAUDER_V8)
-      uint16_t calData[5] = { 382, 3492, 293, 3502, 7 };
-    #else if defined(TFT_DIY)
-      uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY
-    #endif
-    #ifdef HAS_ILI9341
-      tft.setTouch(calData);
-    #endif
-  }
+  #ifndef HAS_CYD_TOUCH
+    if (!landscape) {
+      #ifdef TFT_SHIELD
+        uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
+      #elif defined(MARAUDER_CYD_3_5_INCH)
+        uint16_t calData[5] = { 239, 3560, 262, 3643, 4 };
+      #elif defined(MARAUDER_V8)
+        uint16_t calData[5] = { 298, 3451, 377, 3509, 4 };
+      #elif defined(TFT_DIY)
+        uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
+      #endif
+      #ifdef HAS_ILI9341
+        tft.setTouch(calData);
+      #endif
+    }
+    else {
+      #ifdef TFT_SHIELD
+        uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield
+      #elif defined(MARAUDER_CYD_3_5_INCH)
+        uint16_t calData[5] = { 272, 3648, 234, 3565, 7 };
+      #elif defined(MARAUDER_V8)
+        uint16_t calData[5] = { 382, 3492, 293, 3502, 7 };
+      #else if defined(TFT_DIY)
+        uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY
+      #endif
+      #ifdef HAS_ILI9341
+        tft.setTouch(calData);
+      #endif
+    }
+  #endif
 }
 
 // Function to prepare the display and the menus