diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9e98b51442..65ed624f5e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -45,7 +45,7 @@
 #include <QtNetwork/QNetworkDiskCache>
 
 #include <gl/Config.h>
-#include <QtGui/QOpenGLContext>
+#include <QOpenGLContextWrapper.h>
 
 #include <AccountManager.h>
 #include <AddressManager.h>
@@ -1397,13 +1397,13 @@ void Application::paintGL() {
         _lockedFramebufferMap[finalTexture] = scratchFramebuffer;
 
         uint64_t displayStart = usecTimestampNow();
-        Q_ASSERT(QOpenGLContext::currentContext() == _offscreenContext->getContext());
+        Q_ASSERT(isCurrentContext(_offscreenContext->getContext()));
         {
             PROFILE_RANGE(__FUNCTION__ "/pluginSubmitScene");
             PerformanceTimer perfTimer("pluginSubmitScene");
             displayPlugin->submitSceneTexture(_frameCount, finalTexture, toGlm(size));
         }
-        Q_ASSERT(QOpenGLContext::currentContext() == _offscreenContext->getContext());
+        Q_ASSERT(isCurrentContext(_offscreenContext->getContext()));
 
         uint64_t displayEnd = usecTimestampNow();
         const float displayPeriodUsec = (float)(displayEnd - displayStart); // usecs
diff --git a/libraries/render-utils/src/QOpenGLContextWrapper.cpp b/libraries/render-utils/src/QOpenGLContextWrapper.cpp
index 64233ea413..3e879df7af 100644
--- a/libraries/render-utils/src/QOpenGLContextWrapper.cpp
+++ b/libraries/render-utils/src/QOpenGLContextWrapper.cpp
@@ -37,4 +37,8 @@ bool QOpenGLContextWrapper::makeCurrent(QSurface* surface) {
 
 void QOpenGLContextWrapper::doneCurrent() {
     _context->doneCurrent();
+}
+
+bool isCurrentContext(QOpenGLContext* context) {
+    return QOpenGLContext::currentContext() == context;
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/QOpenGLContextWrapper.h b/libraries/render-utils/src/QOpenGLContextWrapper.h
index 6c50d5f438..832119162c 100644
--- a/libraries/render-utils/src/QOpenGLContextWrapper.h
+++ b/libraries/render-utils/src/QOpenGLContextWrapper.h
@@ -30,4 +30,6 @@ private:
     QOpenGLContext* _context { nullptr };
 };
 
+bool isCurrentContext(QOpenGLContext* context);
+
 #endif // hifi_QOpenGLContextWrapper_h
\ No newline at end of file