diff --git a/app/lib/katello/validators/content_view_environment_coherent_default_validator.rb b/app/lib/katello/validators/content_view_environment_coherent_default_validator.rb
new file mode 100644
index 00000000000..8d1732245d9
--- /dev/null
+++ b/app/lib/katello/validators/content_view_environment_coherent_default_validator.rb
@@ -0,0 +1,22 @@
+module Katello
+  module Validators
+    # ensures that the Default Organization View content view can only be used with the Library environment
+    class ContentViewEnvironmentCoherentDefaultValidator < ActiveModel::Validator
+      def validate(record)
+        #support lifecycle_environment_id for foreman models
+        environment_id = record.respond_to?(:lifecycle_environment_id) ? record.lifecycle_environment_id : record.environment_id
+        if record.content_view_id
+          view = ContentView.where(:id => record.content_view_id).first
+          if environment_id
+            env = KTEnvironment.where(:id => environment_id).first
+            return if view.blank? || env.blank?
+            if view.default? && !env.library?
+              record.errors[:base] << _("Lifecycle environment '%{env}' cannot be used with content view '%{view}'") %
+                                        {:view => view.name, :env => env.name}
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/lib/katello/validators/content_view_environment_validator.rb b/app/lib/katello/validators/content_view_environment_validator.rb
index 6a9c3cdf369..0b5b8cd439e 100644
--- a/app/lib/katello/validators/content_view_environment_validator.rb
+++ b/app/lib/katello/validators/content_view_environment_validator.rb
@@ -1,5 +1,6 @@
 module Katello
   module Validators
+    # used by activation key and content facet
     class ContentViewEnvironmentValidator < ActiveModel::Validator
       def validate(record)
         #support lifecycle_environment_id for foreman models
diff --git a/app/models/katello/content_view_environment.rb b/app/models/katello/content_view_environment.rb
index 1359efc9743..6ea9bae514b 100644
--- a/app/models/katello/content_view_environment.rb
+++ b/app/models/katello/content_view_environment.rb
@@ -19,6 +19,7 @@ class ContentViewEnvironment < Katello::Model
     validates :environment_id, uniqueness: {scope: :content_view_id}, presence: true
     validates :content_view_id, presence: true
     validates_with Validators::ContentViewEnvironmentOrgValidator
+    validates_with Validators::ContentViewEnvironmentCoherentDefaultValidator
 
     before_save :generate_info
 
@@ -42,6 +43,10 @@ def activation_keys
       content_view.activation_keys.in_environment(environment)
     end
 
+    def default_environment?
+      content_view.default? && environment.library?
+    end
+
     # TODO: uncomment when we need to start showing multiple CVE names in UI
     # def candlepin_name
     #   "#{environment.label}/#{content_view.label}"
@@ -52,7 +57,7 @@ def activation_keys
     def generate_info
       self.name ||= environment.name
 
-      if content_view.default?
+      if default_environment?
         self.label ||= environment.label
         self.cp_id ||= Katello::Util::Data.hexdigest(environment.organization.label)
       else
diff --git a/webpack/components/extensions/RegistrationCommands/__tests__/LifeCycleEnvironment.test.js b/webpack/components/extensions/RegistrationCommands/__tests__/LifeCycleEnvironment.test.js
deleted file mode 100644
index 52d6edd4f3e..00000000000
--- a/webpack/components/extensions/RegistrationCommands/__tests__/LifeCycleEnvironment.test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
-import LifecycleEnvironment from '../fields/LifecycleEnvironment';
-
-const fixtures = {
-  renders: {
-    pluginValues: {}, isLoading: false, onChange: () => {}, hostGroupEnvironment: '', lifecycleEnvironments: [],
-  },
-};
-
-describe('LifecycleEnvironment', () =>
-  testComponentSnapshotsWithFixtures(LifecycleEnvironment, fixtures));
diff --git a/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/LifeCycleEnvironment.test.js.snap b/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/LifeCycleEnvironment.test.js.snap
deleted file mode 100644
index 2604d349020..00000000000
--- a/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/LifeCycleEnvironment.test.js.snap
+++ /dev/null
@@ -1,29 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LifecycleEnvironment renders 1`] = `
-<FormGroup
-  fieldId="reg_katello_lce"
-  helperText=""
-  label="Lifecycle environment"
->
-  <FormSelect
-    className="without_select2"
-    id="reg_katello_lce"
-    isDisabled={true}
-    isIconSprite={false}
-    isRequired={false}
-    onBlur={[Function]}
-    onChange={[Function]}
-    onFocus={[Function]}
-    ouiaId="reg-katello-lce"
-    ouiaSafe={true}
-    validated="default"
-    value=""
-  >
-    <FormSelectOption
-      label="No Lifecycle environment to select"
-      value=""
-    />
-  </FormSelect>
-</FormGroup>
-`;
diff --git a/webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js b/webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js
deleted file mode 100644
index 1d6cdd9b98e..00000000000
--- a/webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import {
-  FormGroup,
-  FormSelectOption, FormSelect,
-} from '@patternfly/react-core';
-
-import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import { noop } from 'foremanReact/common/helpers';
-
-const LifecycleEnvironment = ({
-  pluginValues, onChange, isLoading,
-  hostGroupEnvironment, lifecycleEnvironments,
-}) => (
-  <FormGroup
-    label={__('Lifecycle environment')}
-    fieldId="reg_katello_lce"
-    helperText={hostGroupEnvironment && sprintf('From host group: %s', hostGroupEnvironment)}
-  >
-    <FormSelect
-      ouiaId="reg-katello-lce"
-      value={pluginValues?.lifecycleEnvironmentId}
-      onChange={v => onChange({ lifecycleEnvironmentId: v })}
-      className="without_select2"
-      id="reg_katello_lce"
-      isDisabled={isLoading || lifecycleEnvironments.length === 0}
-    >
-      <FormSelectOption
-        value=""
-        label={lifecycleEnvironments.length === 0 ? __('No Lifecycle environment to select') : ''}
-      />
-      {lifecycleEnvironments.map(lce => (
-        <FormSelectOption key={lce.id} value={lce.id} label={lce.name} />
-      ))}
-    </FormSelect>
-  </FormGroup>
-);
-
-LifecycleEnvironment.propTypes = {
-  pluginValues: PropTypes.object, // eslint-disable-line react/forbid-prop-types
-  onChange: PropTypes.func,
-  hostGroupEnvironment: PropTypes.string,
-  lifecycleEnvironments: PropTypes.array, // eslint-disable-line react/forbid-prop-types
-  isLoading: PropTypes.bool,
-};
-
-LifecycleEnvironment.defaultProps = {
-  onChange: noop,
-  isLoading: false,
-  hostGroupEnvironment: '',
-  lifecycleEnvironments: [],
-  pluginValues: {},
-
-};
-
-export default LifecycleEnvironment;
diff --git a/webpack/components/extensions/RegistrationCommands/index.js b/webpack/components/extensions/RegistrationCommands/index.js
index 46ad283d21d..0c05f18f84e 100644
--- a/webpack/components/extensions/RegistrationCommands/index.js
+++ b/webpack/components/extensions/RegistrationCommands/index.js
@@ -3,62 +3,38 @@ import PropTypes from 'prop-types';
 import { noop } from 'foremanReact/common/helpers';
 
 import ActivationKeys from './fields/ActivationKeys';
-import LifecycleEnvironment from './fields/LifecycleEnvironment';
 import IgnoreSubmanErrors from './fields/IgnoreSubmanErrors';
 import Force from './fields/Force';
 
 export const RegistrationCommands = ({
-  organizationId,
-  hostGroupId,
   pluginValues,
-  pluginData,
   onChange,
   isLoading,
-}) => {
-  useEffect(() => {
-    onChange({ lifecycleEnvironmentId: '' });
-  }, [onChange, organizationId, hostGroupId]);
-
-  return (
-    <>
-      <LifecycleEnvironment
-        pluginValues={pluginValues}
-        lifecycleEnvironments={pluginData?.lifecycleEnvironments}
-        hostGroupEnvironment={pluginData?.hostGroupEnvironment}
-        organizationId={organizationId}
-        onChange={onChange}
-        isLoading={isLoading}
-      />
-      <IgnoreSubmanErrors
-        value={pluginValues?.ignoreSubmanErrors}
-        pluginValues={pluginValues}
-        onChange={onChange}
-        isLoading={isLoading}
-      />
-      <Force
-        value={pluginValues?.force}
-        pluginValues={pluginValues}
-        onChange={onChange}
-        isLoading={isLoading}
-      />
-    </>
-  );
-};
+}) => (
+  <>
+    <IgnoreSubmanErrors
+      value={pluginValues?.ignoreSubmanErrors}
+      pluginValues={pluginValues}
+      onChange={onChange}
+      isLoading={isLoading}
+    />
+    <Force
+      value={pluginValues?.force}
+      pluginValues={pluginValues}
+      onChange={onChange}
+      isLoading={isLoading}
+    />
+  </>
+);
 
 RegistrationCommands.propTypes = {
-  organizationId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  hostGroupId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   pluginValues: PropTypes.object, // eslint-disable-line react/forbid-prop-types
-  pluginData: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   onChange: PropTypes.func,
   isLoading: PropTypes.bool,
 };
 
 RegistrationCommands.defaultProps = {
-  organizationId: undefined,
-  hostGroupId: undefined,
   pluginValues: {},
-  pluginData: {},
   isLoading: false,
   onChange: noop,
 };