diff --git a/docs/Changelog.md b/docs/Changelog.md
index badf85bb..0a8e375e 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -5,6 +5,7 @@
 - S3DB layer [#475](https://github.com/mapsforge/vtm/pull/475)
 - vtm-mvt module with MVT tile decoder [#481](https://github.com/mapsforge/vtm/pull/481)
 - OpenMapTiles MVT vector tiles [#482](https://github.com/mapsforge/vtm/issues/482)
+- Fix libGDX flickering [#148](https://github.com/mapsforge/vtm/issues/148) [#149](https://github.com/mapsforge/vtm/issues/149)
 - Render theme fallback internal resources [#477](https://github.com/mapsforge/vtm/issues/477)
 - Many other minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.10.0)
diff --git a/vtm-android-example/src/org/oscim/android/test/GdxActivity.java b/vtm-android-example/src/org/oscim/android/test/GdxActivity.java
index 7aab5666..a49a9b68 100644
--- a/vtm-android-example/src/org/oscim/android/test/GdxActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/GdxActivity.java
@@ -51,7 +51,7 @@ public class GdxActivity extends AndroidApplication {
 
         AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
         cfg.stencil = 8;
-        cfg.numSamples = 2;
+        //cfg.numSamples = 2;
 
         new SharedLibraryLoader().load("vtm-jni");
 
diff --git a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java b/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
index a23ff659..e10ba3c0 100644
--- a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
+++ b/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2018 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -65,7 +65,7 @@ public class GdxMapApp extends GdxMap {
         cfg.width = 800;
         cfg.height = 600;
         cfg.stencil = 8;
-        cfg.samples = 2;
+        //cfg.samples = 2;
         cfg.foregroundFPS = 30;
         cfg.backgroundFPS = 10;
         cfg.forceExit = false;
diff --git a/vtm-gdx/src/org/oscim/gdx/GdxMap.java b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
index ac64b676..694fb8df 100644
--- a/vtm-gdx/src/org/oscim/gdx/GdxMap.java
+++ b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2017 devemux86
+ * Copyright 2016-2018 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -112,8 +112,9 @@ public abstract class GdxMap implements ApplicationListener {
 
     @Override
     public void render() {
-        if (!mRenderRequest)
-            return;
+        // Workaround for flickering
+        /*if (!mRenderRequest)
+            return;*/
 
         mMapRenderer.onDrawFrame();
     }