diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index d9c351631..d0012c2a4 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -23,8 +23,8 @@ import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.compone
 import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
 import { isNullOrUndefined } from 'util';
 import { AuthService } from '@app/core/services/auth/auth.service';
-import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
+import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component';
 
 
 @Component({
@@ -248,6 +248,10 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 
 	getDefaultCriteria(): DmpCriteria {
 		const defaultCriteria = new DmpCriteria();
+		if (this.isPublic) {
+			defaultCriteria.isPublic = true;
+			defaultCriteria.onlyPublic = true;
+		}
 		return defaultCriteria;
 	}