diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
index 4fa71f0e2..96a22c404 100644
--- a/utils/cups-browsed.c
+++ b/utils/cups-browsed.c
@@ -10427,9 +10427,6 @@ found_cups_printer (const char *remote_host, const char *uri,
       (printer->domain == NULL || printer->domain[0] == '\0' ||
        printer->type == NULL || printer->type[0] == '\0')) {
     printer->is_legacy = 1;
-    if (NewBrowsePollQueuesShared){
-      printer->num_options = cupsAddOption("printer-to-be-shared", "true", printer->num_options, &(printer->options));
-    }
 
     if (printer->status != STATUS_TO_BE_CREATED) {
       printer->timeout = time(NULL) + BrowseTimeout;
@@ -10437,6 +10434,10 @@ found_cups_printer (const char *remote_host, const char *uri,
 		   printer->queue_name, BrowseTimeout);
     }
   }
+
+  if (printer && NewBrowsePollQueuesShared)
+    if (HAVE_CUPS_1_6 || (!HAVE_CUPS_1_6 && !printer->is_legacy))
+      printer->num_options = cupsAddOption("printer-to-be-shared", "true", printer->num_options, &(printer->options));
 }
 
 gboolean