diff --git a/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java b/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java
index bd84048f..3196ddfc 100644
--- a/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java
+++ b/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java
@@ -325,7 +325,11 @@ public ListenableFuture<Void> detachPreviewSurface() {
                 mExecutor.execute(
                         () -> {
                             if (!mIsShutdown) {
-                                setWindowSurface(mAdditionalContext, null);
+                                if (mAdditionalContext != 0) {
+                                    setWindowSurface(mAdditionalContext, null);
+                                } else if (DEBUG) {
+                                    Log.d(TAG, "!!! mAdditionalContext null during detachPreviewSurface");
+                                }
                                 mAdditionalTransformation.mSurfaceSize = null;
                             }
                             completer.set(null);