diff --git a/composite.cpp b/composite.cpp
index e7d9a8af07..245676a6ab 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -167,9 +167,8 @@ void Workspace::setupCompositing()
                 scene = NULL;
                 }
 
-            // Fall back to XRender
-            kDebug(1212) << "Falling back to XRender as OpenGL failed";
-            type = options->compositingMode = XRenderCompositing;
+            // Do not Fall back to XRender - it causes problems when selfcheck fails during startup, but works later on
+            break;
             }
 #endif
 #ifdef KWIN_HAVE_XRENDER_COMPOSITING
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index d75ffa6abc..fc6e967408 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -713,7 +713,7 @@ bool SceneOpenGL::selfCheckFinish()
             || img.pixel( 1, 1 ) != QColor( Qt::black ).rgb()
             || img.pixel( 2, 1 ) != QColor( Qt::white ).rgb())
             {
-            kError( 1212 ) << "OpenGL compositing self-check failed, falling back to XRender.";
+            kError( 1212 ) << "OpenGL compositing self-check failed, disabling compositing.";
             ok = false;
             break;
             }