diff --git a/Graphics/GraphicsEngineOpenGL/include/GLObjectWrapper.hpp b/Graphics/GraphicsEngineOpenGL/include/GLObjectWrapper.hpp
index 197d63701..a61dc87c3 100644
--- a/Graphics/GraphicsEngineOpenGL/include/GLObjectWrapper.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/GLObjectWrapper.hpp
@@ -126,7 +126,29 @@ class GLObjWrapper
         VERIFY_EXPR(Name != nullptr);
         if (glObjectLabel && m_uiHandle)
         {
-            glObjectLabel(m_CreateReleaseHelper.Type, m_uiHandle, -1, Name);
+            static GLint MaxLabelLen = 0;
+            if (MaxLabelLen == 0)
+            {
+                glGetIntegerv(GL_MAX_LABEL_LENGTH, &MaxLabelLen);
+#    ifdef DILIGENT_DEVELOPMENT
+                glGetError(); // Ignore GL error
+#    endif
+                if (MaxLabelLen <= 0)
+                {
+                    // Minimum required value by the spec
+                    MaxLabelLen = 256;
+                }
+
+                // The spec requires that the number of characters in <label>,
+                // excluding the null terminator, is less than the value of MAX_LABEL_LENGTH.
+                // In other words, the maximum length of the label is one less than the value of MAX_LABEL_LENGTH.
+                --MaxLabelLen;
+            }
+            GLsizei Length = static_cast<GLsizei>(strlen(Name));
+            if (Length > MaxLabelLen)
+                Length = MaxLabelLen;
+
+            glObjectLabel(m_CreateReleaseHelper.Type, m_uiHandle, Length, Name);
 #    ifdef DILIGENT_DEVELOPMENT
             glGetError(); // Ignore GL error
 #    endif
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h b/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h
index 4e28bb38b..1e39c1e8c 100644
--- a/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h
+++ b/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h
@@ -1037,6 +1037,11 @@
 #endif
 
 
+#ifndef GL_MAX_LABEL_LENGTH
+#   define GL_MAX_LABEL_LENGTH 0x82E8
+#endif
+
+
 /* ------------------------------ GL_EXT_disjoint_timer_query ----------------------------- */
 #ifndef GL_TIMESTAMP
 #   define GL_TIMESTAMP 0x8E28