diff --git a/ui-server/app/controllers/theme_controller.rb b/ui-server/app/controllers/theme_controller.rb
index 473718a..7a73d39 100644
--- a/ui-server/app/controllers/theme_controller.rb
+++ b/ui-server/app/controllers/theme_controller.rb
@@ -119,11 +119,13 @@ class ThemeController < ApplicationController
     case element_type
     when 'background'
       thumbnails = @theme.backgrounds
-      nonremovable = @theme.default_background
+      #nonremovable = @theme.default_background
+      nonremovable = "AAA-nobackground-default"
       partial_view = "/theme/background_thumbnails"
     when 'logo'
       thumbnails = @theme.logos
-      nonremovable = @theme.default_logo
+      #nonremovable = @theme.default_logo
+      nonremovable = "AAA-nologo-default"
       partial_view = "/theme/logo_thumbnails"
     when 'desktop'
       thumbnails = @theme.desktop_thumbnails