diff --git a/apps/lint_exemptions.js b/apps/lint_exemptions.js
index e4b489333..753e0a62a 100644
--- a/apps/lint_exemptions.js
+++ b/apps/lint_exemptions.js
@@ -475,12 +475,6 @@ module.exports = {
       "no-undef"
     ]
   },
-  "apps/warpdrive/app.js": {
-    "hash": "c2f9113c4d298a3021ec4bc0bc5f5d1bcd88267b4fa2acc03ae17d6447ed7d00",
-    "rules": [
-      "no-undef"
-    ]
-  },
   "apps/usgs/settings.js": {
     "hash": "00ee672a6920f5667bfbd2988fd2853cfd579895a843ae036a00028dcb13878d",
     "rules": [
diff --git a/apps/synthwave/ChangeLog b/apps/synthwave/ChangeLog
index 03c748ea5..c12c017e6 100644
--- a/apps/synthwave/ChangeLog
+++ b/apps/synthwave/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New app!
 0.02: Minor code improvements
 0.03: Minor code improvements
+0.04: Remove buffer finding code (which fails if screen rotated) and make dependent on fw 2v21's Bangle.getOptions().lcdBufferPtr (fix #3818)
\ No newline at end of file
diff --git a/apps/synthwave/app.js b/apps/synthwave/app.js
index 41711d950..2f81d877f 100644
--- a/apps/synthwave/app.js
+++ b/apps/synthwave/app.js
@@ -618,10 +618,7 @@ var fontNum = atob("AAAAAAAAAAAAAA//8D//g//8P/+I//8//44//w//j4//A/+P4/8A/4/4AAAA
 const sintable = new Uint8Array(256);
 let bgColor = 0;
 const BLACK = g.setColor.bind(g, 0);
-const WHITE = g.setColor.bind(g, 0xFFFF);
-let lcdBuffer = 0,
-  start = 0;
-
+let lcdBuffer = 0;
 let locked = false;
 let charging = false;
 let stopped = true;
@@ -641,75 +638,6 @@ function setupInterval(force) {
   }
 }
 
-function test(addr, y) {
-  BLACK().fillRect(0, y, 176, y);
-  if (peek8(addr)) return false;
-  WHITE().fillRect(0, y, 176, y);
-  let b = peek8(addr);
-  BLACK().fillRect(0, y, 176, y);
-  if (!b) return false;
-  return !peek8(addr);
-}
-
-function probe() {
-  if (!start) {
-    start = 0x20000000;
-    if (test(Bangle.getOptions().lcdBufferPtr, 0))
-      start = Bangle.getOptions().lcdBufferPtr; // FW=2v21
-    else if (test(0x2002d3fe, 0)) // try to skip loading if possible
-      start = 0x2002d3fe; // FW=2v20
-  }
-  const end = Math.min(start + 0x800, 0x20038000);
-
-  if (start >= end) {
-    print("Could not find framebuffer");
-    return;
-  }
-
-  BLACK().fillRect(0, 0, 176, 0);
-  // sampling every 64 bytes since a 176-pixel row is 66 bytes at 3bpp
-  for (; start < end; start += 64) {
-    if (peek8(start)) continue;
-    WHITE().fillRect(0, 0, 176, 0);
-    let b = peek8(start);
-    BLACK().fillRect(0, 0, 176, 0);
-    if (!b) continue;
-    if (!peek8(start)) break;
-  }
-
-  if (start >= end) {
-    setTimeout(probe, 1);
-    return;
-  }
-
-  // find the beginning of the row
-  while (test(start - 1, 0))
-    start--;
-
-  /*
-    let stride = (176 * 3 + 7) >> 3,
-      padding = 0;
-    for (let i = 0; i < 20; ++i, ++padding) {
-      if (test(start + stride + padding, 1)) {
-        break;
-      }
-    }
-
-    stride += padding;
-    if (padding == 20) {
-      print("Warning: Could not calculate padding");
-      stride = 68;
-    }
-    */
-  let stride = 68;
-
-  lcdBuffer = start;
-  print('Found lcdBuffer at ' + lcdBuffer.toString(16) + ' stride=' + stride);
-  gfx.init(start, stride, E.getAddressOf(sintable, true));
-  gfx.setCamera(0, 0, 0);
-  setupInterval(true);
-}
-
 function init() {
   require("Font5x9Numeric7Seg").add(Graphics);
   g.setFont("5x9Numeric7Seg");
@@ -723,7 +651,23 @@ function init() {
   // setup sin/cos table
   for (let i = 0; i < sintable.length; ++i)
       sintable[i] = Math.sin((i * Math.PI * 0.5) / sintable.length) * ((1 << 8) - 1);
-  setTimeout(probe, 1);
+
+  lcdBuffer = Bangle.getOptions().lcdBufferPtr;
+  if (!lcdBuffer) {
+    E.showMessage("Needs firmwave 2v21 or newer");
+    return;
+  }
+  let stride = 68;
+  //print('Found lcdBuffer at ' + lcdBuffer.toString(16) + ' stride=' + stride);
+  var sintablePtr = E.getAddressOf(sintable, true);
+  if (!sintablePtr) {
+    lcdBuffer = 0;
+    E.showMessage("Not enough memory");
+    return;
+  }
+  gfx.init(lcdBuffer, stride, sintablePtr);
+  gfx.setCamera(0, 0, 0);
+  setupInterval(true);
 }
 
 function tick(locked) {
diff --git a/apps/synthwave/metadata.json b/apps/synthwave/metadata.json
index 8f9864441..274484ea0 100644
--- a/apps/synthwave/metadata.json
+++ b/apps/synthwave/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "synthwave",
   "name": "synthwave clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A watchface with an animated 3D scene.",
   "readme": "README.md",
   "icon": "app.png",