diff --git a/ee/app/models/remote_development/workspace.rb b/ee/app/models/remote_development/workspace.rb
index a9aee6eb73a1fa0d6adaba460046b41e674d09ac..4cba54545286e068b84ad0bd8774180e5f7fc0c0 100644
--- a/ee/app/models/remote_development/workspace.rb
+++ b/ee/app/models/remote_development/workspace.rb
@@ -20,7 +20,9 @@ class Workspace < ApplicationRecord
     validates :agent, presence: true
     validates :editor, presence: true
     validates :personal_access_token, presence: true
-    validates :workspaces_agent_config_version, presence: true, if: -> { agent&.workspaces_agent_config }
+    # TODO: uncomment this line with below issue in 17.6
+    # https://gitlab.com/gitlab-org/gitlab/-/issues/493992
+    # validates :workspaces_agent_config_version, presence: true, if: -> { agent&.workspaces_agent_config }
 
     # See https://gitlab.com/gitlab-org/remote-development/gitlab-remote-development-docs/blob/main/doc/architecture.md?plain=0#workspace-states
     # for state validation rules
diff --git a/ee/spec/models/remote_development/workspace_spec.rb b/ee/spec/models/remote_development/workspace_spec.rb
index fbcd4a7a8236dff9e367381290ffef8bd1a826fe..b0be73c219485e4641ca32898ee5b4bad4ad4f4c 100644
--- a/ee/spec/models/remote_development/workspace_spec.rb
+++ b/ee/spec/models/remote_development/workspace_spec.rb
@@ -319,17 +319,19 @@
     end
 
     context 'on workspaces_agent_config_version' do
-      context 'when version is nil' do
-        before do
-          workspace.save!
-          workspace.workspaces_agent_config_version = nil
-        end
-
-        it 'raises error message as expected' do
-          expect(workspace).not_to be_valid
-          expect(workspace.errors.full_messages).to include("Workspaces agent config version can't be blank")
-        end
-      end
+      # TODO: uncomment tests with below issue in 17.6
+      # https://gitlab.com/gitlab-org/gitlab/-/issues/493992
+      # context 'when version is nil' do
+      #   before do
+      #     workspace.save!
+      #     workspace.workspaces_agent_config_version = nil
+      #   end
+
+      #   it 'raises error message as expected' do
+      #     expect(workspace).not_to be_valid
+      #     expect(workspace.errors.full_messages).to include("Workspaces agent config version can't be blank")
+      #   end
+      # end
 
       context 'when version is greater than version range' do
         before do